diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4e700fe1e9e3..38e63cf29d44 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22918,6 +22918,11 @@ matrix = "@c3n21:matrix.org"; githubId = 37077738; }; + sinjin2300 = { + name = "Sinjin"; + github = "Sinjin2300"; + githubId = 35543336; + }; sioodmy = { name = "Antoni SokoĊ‚owski"; github = "sioodmy"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index fe3e5e28cef3..031ac6d70db7 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -565,6 +565,32 @@ let # preventing compilations of chromium with versions below their intended version, not about running the very # exact version or even running a newer version. ./patches/chromium-136-nodejs-assert-minimal-version-instead-of-exact-match.patch + ] + ++ lib.optionals (chromiumVersionAtLeast "137") [ + (fetchpatch { + # Partial revert of upstream clang+llvm bump revert to fix the following error when building with LLVM < 21: + # clang++: error: unknown argument: '-fextend-variable-liveness=none' + # https://chromium-review.googlesource.com/c/chromium/src/+/6514242 + name = "chromium-137-llvm-19.patch"; + url = "https://chromium.googlesource.com/chromium/src/+/ddf8f8a465be2779bd826db57f1299ccd2f3aa25^!?format=TEXT"; + includes = [ "build/config/compiler/BUILD.gn" ]; + revert = true; + decode = "base64 -d"; + hash = "sha256-wAR8E4WKMvdkW8DzdKpyNpp4dynIsYAbnJ2MqE8V2o8="; + }) + ] + ++ lib.optionals (chromiumVersionAtLeast "137") [ + (fetchpatch { + # Backport "Fix build with system libpng" that fixes a typo in core/fxcodec/png/png_decoder.cpp that causes + # the build to fail at the final linking step. + # https://pdfium-review.googlesource.com/c/pdfium/+/132130 + name = "pdfium-Fix-build-with-system-libpng.patch"; + url = "https://pdfium.googlesource.com/pdfium.git/+/83f11d630aa1cb6d5ceb292364412f7b0585a201^!?format=TEXT"; + extraPrefix = "third_party/pdfium/"; + stripLen = 1; + decode = "base64 -d"; + hash = "sha256-lDX0OLdxxTNLtViqEt0luJQ/H0mlvQfV0zbY1Ubqyq0="; + }) ]; postPatch = diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 64a68d26f105..b3bda2dfd9df 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,27 +1,27 @@ { "chromium": { - "version": "136.0.7103.113", + "version": "137.0.7151.55", "chromedriver": { - "version": "136.0.7103.114", - "hash_darwin": "sha256-RAWarx2vOh23XKvhNwAkCgG9swGxX1dw8LaqIQBPJFo=", - "hash_darwin_aarch64": "sha256-TZcO5RiRW0dN0+jBArclBkIvYSSirhmPgJXswfTufgk=" + "version": "137.0.7151.56", + "hash_darwin": "sha256-z4GTPrONaXARP0d8vInJdFxR052PuuI6IJy1PEv2RNg=", + "hash_darwin_aarch64": "sha256-wlSDfCiBTdLWwabpHwOiM8Y3asn7ueHGSMh2AANaE+A=" }, "deps": { "depot_tools": { - "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f", - "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg=" + "rev": "1fcc527019d786502b02f71b8b764ee674a40953", + "hash": "sha256-7HJyJARZPes5MmKgXd3TV1uRjk0bH/pkPm+F4scg+Tc=" }, "gn": { - "rev": "6e8e0d6d4a151ab2ed9b4a35366e630c55888444", - "hash": "sha256-vDKMt23RMDI+KX6CmjfeOhRv2haf/mDOuHpWKnlODcg=" + "rev": "85cc21e94af590a267c1c7a47020d9b420f8a033", + "hash": "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI=" }, - "npmHash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo=" + "npmHash": "sha256-I6MsfAhrLRmgiRJ13LSejfy2N63C3Oug5tOOXA622j4=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "76fa3c1782406c63308c70b54f228fd39c7aaa71", - "hash": "sha256-U6WsxmGf4eFKVBBgppoHIfMlrT34a1oymZETzEhzkQA=", + "rev": "254bc711794d7ad269495f3d419a209935b78cad", + "hash": "sha256-dB81lgjgVK0qXWgAddB7G4L7rsJpZp+0VsjDKvGugEs=", "recompress": true }, "src/third_party/clang-format/script": { @@ -31,28 +31,28 @@ }, "src/third_party/compiler-rt/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git", - "rev": "bc2b30185219a2defe3c8a3b45f95a11386a7f6f", - "hash": "sha256-bfDMglQaiExTFwaVBroia+6G+9AHEVy5cQGocaEVOgA=" + "rev": "d0e4db9fcea15a392aaada986cbe33658afc0454", + "hash": "sha256-P/uDeqalafY1S7AqZkL1Pz7Jc+iWrkfiACxEtgTRqdU=" }, "src/third_party/libc++/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "449310fe2e37834a7e62972d2a690cade2ef596b", - "hash": "sha256-Ypi5fmWdoNA1IZDoKITlkNRITmho8HzVlgjlmtx0Y84=" + "rev": "9d0cba76be7399399d3a499ff3a52c264db3b104", + "hash": "sha256-wpMma142NBqyrSbaReQr5yOYhvQIZ06j6S2EUnXmZ2I=" }, "src/third_party/libc++abi/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "94c5d7a8edc09f0680aee57548c0b5d400c2840d", - "hash": "sha256-wMMfj3E2AQJxovoSEIuT2uTyrcGBurS1HrHZOmP36+g=" + "rev": "f2a7f2987f9dcdf8b04c2d8cd4dcb186641a7c3e", + "hash": "sha256-X9cAbyd8ZPSwqOGhPYwIZ6b9E3tVwAuAYZKMgbZQxgk=" }, "src/third_party/libunwind/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "e2e6f2a67e9420e770b014ce9bba476fa2ab9874", - "hash": "sha256-LdRaxPo2i7uMeFxpR7R4o3V+1ycBcygT/D+gklsD0tA=" + "rev": "81e2cb40a70de2b6978e6d8658891ded9a77f7e3", + "hash": "sha256-XdFKn+cGOxA0fHkVMG9UAhCmpML44ocoyHB7XnumX7o=" }, "src/third_party/llvm-libc/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git", - "rev": "97989c1bfa112c81f6499487fedc661dcf6d3b2e", - "hash": "sha256-9Ieaxe0PFIIP4RttODd8pTw/zVjQZGZtaYSybwnzTz0=" + "rev": "cc59264cf9b2ecab0cfc8b51f6f1878372416d36", + "hash": "sha256-wQMUL5uAaR8sA1V0FHTZv3jVVaF3NxiHfNnlMq3YImY=" }, "src/chrome/test/data/perf/canvas_bench": { "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", @@ -71,18 +71,18 @@ }, "src/docs/website": { "url": "https://chromium.googlesource.com/website.git", - "rev": "929dd3e6d02aac1f46653d03b2a644e2873a3bbb", - "hash": "sha256-lY4P2f90/9JwCpxuBFjim7KygczM8zMDQVUaEYaQjnA=" + "rev": "e157e12d99cfc729a970b474344673c44e2d2c9c", + "hash": "sha256-fowwJbXOR4OIN4+1bJEWv9VP/TLHb9+H1Vt3apVLwkk=" }, "src/media/cdm/api": { "url": "https://chromium.googlesource.com/chromium/cdm.git", - "rev": "5a1675c86821a48f8983842d07f774df28dfb43c", - "hash": "sha256-FgeuOsxToA4qx3H76czCPeO/WVtprRkllDMPancw3Ik=" + "rev": "852a81f0ae3ab350041d2e44d207a42fb0436ae1", + "hash": "sha256-3JBBcBg2ep/7LnvMHBWnqAFG+etETArFXZr4Klv30T4=" }, "src/net/third_party/quiche/src": { "url": "https://quiche.googlesource.com/quiche.git", - "rev": "5077431b183c43f10890b865fc9f02a4dcf1dd85", - "hash": "sha256-CLvZTBvtTdOpC8eWUTWkb0ITJ5EViPmc6d5O8cTaKY8=" + "rev": "faec206356fe384c522f34982ae2e92f2f111242", + "hash": "sha256-8SuRhYAD3RWMiqD/a8usrRnYKd6prAK5jdwJVXRI+Q0=" }, "src/testing/libfuzzer/fuzzers/wasm_corpus": { "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git", @@ -96,8 +96,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "fa40b7c586fd2da9fd7e5c4d893ecb1334553b9e", - "hash": "sha256-bIpN9lehrKpJYBKLeo8Szz0/aVe7NU2Eo2NIO5dAZ9w=" + "rev": "df9c59dcacff7d186d00e3263a1aa68f8059137c", + "hash": "sha256-ybi/DwOQ10I+MK9buKpdNcUlFAI9RA3NfyoB3Udpfyo=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -111,8 +111,8 @@ }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "b6bb4bab7b4a36bc95566e00cb8f01051089afc3", - "hash": "sha256-L2ewIW6C+PTftbbXf+nlWcFD0y4naBNg7FLXMMxiWac=" + "rev": "dd7e71367795e2dc4d46effda5378f22e9000d16", + "hash": "sha256-EZoSoDLFWRR2xkHOKNaNVQvubFp8in0p7/CHN8CFaVI=" }, "src/third_party/anonymous_tokens/src": { "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", @@ -131,8 +131,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "1cffe7ec763900d104e4df62bc96d93f572157cb", - "hash": "sha256-VK+5saAJlZOluMAYKTKwNcnZALsCYkzgVfQHylt3584=" + "rev": "fbe707f88ccabca01031e47bf165bd9d499878dd", + "hash": "sha256-8tmDR3l7eHWUfVRU90Kg76N/moU6Lb5b3FySJOckl8U=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -141,8 +141,8 @@ }, "src/third_party/dawn/third_party/dxc": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "206b77577d15fc5798eb7ad52290388539b7146d", - "hash": "sha256-WXgiOlqtczrUkXp46Q/GTaYk0LDqebQSFbyWpD299Xw=" + "rev": "8209d53f0ef0257e5b8c78d22057086403946cca", + "hash": "sha256-2yM8Fct7Ru8ZSFr+Qm1Bv52K2/geAwmOpWc/X7yxLQY=" }, "src/third_party/dawn/third_party/dxheaders": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", @@ -161,8 +161,8 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "5fbd82847521cb2d584773facd56c2eb6a4df180", - "hash": "sha256-WTVOc2EVB/DJ4aDeB8XIF/ff6LSeEUMt2Xkvj5Hu4aU=" + "rev": "3df76734dc695c4d1c51276b5d9eb63078362972", + "hash": "sha256-4jCsCt2rcUpUk2xeL3tZx/jTnuJ+COG+xsDtR+sK1oQ=" }, "src/third_party/highway/src": { "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", @@ -176,13 +176,13 @@ }, "src/third_party/boringssl/src": { "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "a9993612faac4866bc33ca8ff37bfd0659af1c48", - "hash": "sha256-fUPl9E2b7RfanH0pZNArIkJ4lnnmCtyk7sCaTArCB70=" + "rev": "918cf66ed841930fe1554ae8d78974b95e989596", + "hash": "sha256-gzcXse/emv9JBMiInUV5KTeyMQ0igUdFpzUJR4vCUu4=" }, "src/third_party/breakpad/breakpad": { "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "657a441e5c1a818d4c10b7bafd431454e6614901", - "hash": "sha256-9MePkv10fwyJ0VDWRtvRcbLMAcJzZlziGTPzXJYjVJE=" + "rev": "232a723f5096ab02d53d87931efa485fa77d3b03", + "hash": "sha256-0ynZuxIqBIpNkfD3Y9XdPFQr7HeQcsUO3lhnqvH+k8c=" }, "src/third_party/cast_core/public/src": { "url": "https://chromium.googlesource.com/cast_core/public", @@ -191,8 +191,8 @@ }, "src/third_party/catapult": { "url": "https://chromium.googlesource.com/catapult.git", - "rev": "5bda0fdab9d93ec9963e2cd858c7b49ad7fec7d4", - "hash": "sha256-xwR9gGE8uU8qFr7GgS3/1JiuTmj1tvcM5CoCfPMdW2M=" + "rev": "000f47cfa393d7f9557025a252862e2a61a60d44", + "hash": "sha256-FIJZE1Qu1MLZA4qxB68k1NjhgSbFTjf57YF85JicVZw=" }, "src/third_party/ced/src": { "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", @@ -216,8 +216,8 @@ }, "src/third_party/cpuinfo/src": { "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea", - "hash": "sha256-JNLaK105qDk9DxTqCFyXFfYn46dF+nZIaF5urSVRa0U=" + "rev": "39ea79a3c132f4e678695c579ea9353d2bd29968", + "hash": "sha256-uochXC0AtOw8N/ycyVJdiRw4pibCW2ENrFMT3jtxDSg=" }, "src/third_party/crc32c/src": { "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", @@ -226,29 +226,34 @@ }, "src/third_party/cros_system_api": { "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "62ab80355a8194e051bd1d93a5c09093c7645a32", - "hash": "sha256-pZi6GRu7OGL7jbN4FM2qDsLCsT6cM+RM0a7XtFZVSVE=" + "rev": "68114875ad35b573034a2ab1f5cdf3dbb0e59468", + "hash": "sha256-cGpteAnjGcxJUcrdLRFfQN7ruTEdNvNCbOH6EC+a39s=" }, "src/third_party/crossbench": { "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "ce46be2573328fa7b0fd1d23c04b63389f298122", - "hash": "sha256-Q0kdJdEmh+wbO5oeTp98OHKh9luz8u6PDztGToldZjk=" + "rev": "d91cc488cd651b00009e5d6c70f222362598bec9", + "hash": "sha256-o/sw1P+mZOSb6XIVFivC02hTPu++x+xJy2SRP2I9yGE=" }, "src/third_party/depot_tools": { "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f", - "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg=" + "rev": "1fcc527019d786502b02f71b8b764ee674a40953", + "hash": "sha256-7HJyJARZPes5MmKgXd3TV1uRjk0bH/pkPm+F4scg+Tc=" }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "4a53cbe7a1270c91ec60903ee792de658453becb", - "hash": "sha256-hEksLeJli/1TNNrDcUjv19cpyIJph6kfriNfe7FWO0U=" + "rev": "a54ed1df191a9e2aff2e9ef453ee6fdc959dd125", + "hash": "sha256-E6sx2ioDZRWJljbS17ztRwz+gsDhIHiluvkUx1rRZcw=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=" }, + "src/third_party/dragonbox/src": { + "url": "https://chromium.googlesource.com/external/github.com/jk-jeon/dragonbox.git", + "rev": "6c7c925b571d54486b9ffae8d9d18a822801cbda", + "hash": "sha256-AOniXMPgwKpkJqivRd+GazEnhdw53FzhxKqG+GdU+cc=" + }, "src/third_party/eigen3/src": { "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", "rev": "464c1d097891a1462ab28bf8bb763c1683883892", @@ -266,8 +271,8 @@ }, "src/third_party/ffmpeg": { "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "fbce2a76c00cd2e5aeffe3c2e71d44c284ec52d6", - "hash": "sha256-bGa0BCvzNxEKu9VZEwJ1NLt+b2KKWUxshpKSN2FHNEM=" + "rev": "01f23648c6b84de6c0f717fa4e1816f53b9ee72e", + "hash": "sha256-hNzQZQxaa2Wtl7GWWF852cFmmXy4pc15Pp0d59TTfnI=" }, "src/third_party/flac": { "url": "https://chromium.googlesource.com/chromium/deps/flac.git", @@ -296,8 +301,8 @@ }, "src/third_party/freetype/src": { "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "82090e67c24259c343c83fd9cefe6ff0be7a7eca", - "hash": "sha256-LhSIX7X0+dmLADYGNclg73kIrXmjTMM++tJ92MKzanA=" + "rev": "2d1abd3bbb4d2396ed63b3e5accd66724cf62307", + "hash": "sha256-MAVHzILj9f+/HfVjZXyJkSQM3WBwzg7IDpAwiYHfA88=" }, "src/third_party/freetype-testing/src": { "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", @@ -311,18 +316,18 @@ }, "src/third_party/harfbuzz-ng/src": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "8efd2d85c78fbba6ca09a3e454f77525f3b296ce", - "hash": "sha256-/WNGrvyvJ+FGqoIoHapaux1iu63zjID0yR30HYPpxaw=" + "rev": "9f83bbbe64654b45ba5bb06927ff36c2e7588495", + "hash": "sha256-lNnCtgIegUy4DLhYaGZXcEaFw83KWAHoKpz69AEsWp4=" }, "src/third_party/ink/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink.git", - "rev": "c542d619a8959415beda5a76fe89ffa2f83df886", - "hash": "sha256-sMqSHYs3lvuHXEov1K9xWRd8tUPG00QBJl6an0zrxwA=" + "rev": "da9cb551ada1e55309b0ac89b9fbff2d29dbfe1e", + "hash": "sha256-MqJXwtUGL/IakwOO63JX4gx0gTocgQT3hbhw6OcYUbc=" }, "src/third_party/ink_stroke_modeler/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git", - "rev": "f61f28792a00c9bdcb3489fec81d8fd0ca1cbaba", - "hash": "sha256-XMLW/m+Qx+RVgo1DeYggBLjUYg/M+2eHwgjVWrA/Erw=" + "rev": "03db1ed37b8b10b47d62ed0fa142d198a3861689", + "hash": "sha256-jnIljheEBq96e6zZO87bhVJbA1vIjiRzm1Hh6YMBdnU=" }, "src/third_party/instrumented_libs": { "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git", @@ -346,8 +351,8 @@ }, "src/third_party/googletest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "52204f78f94d7512df1f0f3bea1d47437a2c3a58", - "hash": "sha256-8keF4E6ag/rikv5ROaWUB7oganjViupEAdxW1NJVgmE=" + "rev": "cd430b47a54841ec45d64d2377d7cabaf0eba610", + "hash": "sha256-QT9PQ9bF+eCPfRLkcHpH4jc0UZfGPc98fHf8QDV5bZg=" }, "src/third_party/hunspell_dictionaries": { "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", @@ -356,8 +361,8 @@ }, "src/third_party/icu": { "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b", - "hash": "sha256-Omv4sp9z44eINXtaE0+1TzIU1q2hWviANA79fmkF78U=" + "rev": "4c8cc4b365a505ce35be1e0bd488476c5f79805d", + "hash": "sha256-eGI/6wk6IOUPvX7pRTm4VJk1CqkkxalTu84L36i/D6k=" }, "src/third_party/jsoncpp/source": { "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", @@ -376,8 +381,8 @@ }, "src/third_party/fuzztest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "c31f0c0e6df5725c6b03124b579c9cf815fd10f4", - "hash": "sha256-Dz7DqucOxr5HzLNOdGNOG4iMw66bkOj64qOvqeADTic=" + "rev": "b10387fdbbca18192f85eaa5323a59f44bf9c468", + "hash": "sha256-L2QG0pUmGjGdtdlivxYfxSqO9YaVHpIT6lvJwBMTxMw=" }, "src/third_party/domato/src": { "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git", @@ -391,8 +396,8 @@ }, "src/third_party/libaom/source/libaom": { "url": "https://aomedia.googlesource.com/aom.git", - "rev": "9680f2b1781fb33b9eeb52409b75c679c8a954be", - "hash": "sha256-nfnt5JXyKR9JR3BflpGEkwzDo0lYa/oeCDm2bKH/j1g=" + "rev": "719f60edc51b6141a2434bf1b5110c2fb075b246", + "hash": "sha256-W62uXVbQiq6Ef3bar2NsCXJoz5KKUK8Y/9n2vK7Vf3Q=" }, "src/third_party/crabbyavif/src": { "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", @@ -401,13 +406,8 @@ }, "src/third_party/nearby/src": { "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "8acf9249344ea9ff9806d0d7f46e07640fddf550", - "hash": "sha256-qIIyCHay3vkE14GVCq77psm1OyuEYs4guAaQDlEwiMg=" - }, - "src/third_party/beto-core/src": { - "url": "https://beto-core.googlesource.com/beto-core.git", - "rev": "89563fec14c756482afa08b016eeba9087c8d1e3", - "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY=" + "rev": "e71de0e0c312caf8d2fa22f132619c6a68496444", + "hash": "sha256-dzJtRhoPA1FWeu0xjd7kJ1Q2nT5gIkKpIgQmywsRlPY=" }, "src/third_party/securemessage/src": { "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git", @@ -416,8 +416,8 @@ }, "src/third_party/jetstream/main": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", - "rev": "0260caf74b5c115507ee0adb6d9cdf6aefb0965f", - "hash": "sha256-DbRup4tOAYv27plzB2JKi2DBX2FVMDtFR7AzuovXUDU=" + "rev": "0976ddeae0863ef5fb3f9ad09906224b0989f9ad", + "hash": "sha256-NyXGd7SwsECGBJ2qodGYB3os+UBgIOg/I8mnrsZJuTg=" }, "src/third_party/jetstream/v2.2": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", @@ -426,8 +426,8 @@ }, "src/third_party/speedometer/main": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", - "rev": "c760d160caa05792d3ed7650e85861c9f9462506", - "hash": "sha256-/nAK2uLjpPem37XCHHx3LGZEpvL/7w4Uw5bVpQ4C6ms=" + "rev": "dd661c033abdde11022779f40375c52632a9f43a", + "hash": "sha256-1/G06WCO5ssBS3+T6E3rnGdIf0r205wVxfJX7lgivR4=" }, "src/third_party/speedometer/v3.1": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", @@ -466,8 +466,8 @@ }, "src/third_party/expat/src": { "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", - "rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3", - "hash": "sha256-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg=" + "rev": "69d6c054c1bd5258c2a13405a7f5628c72c177c2", + "hash": "sha256-qe8O7otL6YcDDBx2DS/+c5mWIS8Rf8RQXVtLFMIAeyk=" }, "src/third_party/libipp/libipp": { "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", @@ -511,8 +511,8 @@ }, "src/third_party/libvpx/source/libvpx": { "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "027bbee30a0103b99d86327b48d29567fed11688", - "hash": "sha256-+4I6B1aTa+txhey6LMeflU0pe39V6TJ+lNIJPh6yFGM=" + "rev": "40ec928b3fadcf8edd836445bb5842a11aeb7a2d", + "hash": "sha256-aUHvIv78KTiyN/cOYNuhW4UCOD55s8l8VLu4oP0Pk1s=" }, "src/third_party/libwebm/source": { "url": "https://chromium.googlesource.com/webm/libwebm.git", @@ -526,8 +526,8 @@ }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "ccdf870348764e4b77fa3b56accb2a896a901bad", - "hash": "sha256-8sH11psWPXLMy3Q0tAizCZ/woUWvTCCUf44jcr2C4Xs=" + "rev": "9f9b5cf660dcfa0d3fdee41cf4ffbe4bb6e95114", + "hash": "sha256-OYmsMPz7nJwkVSpsDW7SbqrCU5raC1k3Mh/UkonCujM=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", @@ -546,8 +546,8 @@ }, "src/third_party/nasm": { "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", - "rev": "767a169c8811b090df222a458b25dfa137fc637e", - "hash": "sha256-yg4qwhS68B/sWfcJeXUqPC69ppE8FaIyRc+IkUQXSnU=" + "rev": "9f916e90e6fc34ec302573f6ce147e43e33d68ca", + "hash": "sha256-neYrS4kQ76ihUh22Q3uPR67Ld8+yerA922YSZU1KxJs=" }, "src/third_party/neon_2_sse/src": { "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", @@ -561,8 +561,8 @@ }, "src/third_party/openscreen/src": { "url": "https://chromium.googlesource.com/openscreen", - "rev": "db9e1ea566813606ca055868be13f6ff4a760ab8", - "hash": "sha256-K/frmCf3JMvPVZc6ZKPFAQrq4Pz4io3XBvADS0O5u78=" + "rev": "40fe10467c27b6536e5d3241e5881b6e9f243216", + "hash": "sha256-fKXCuGzNVcN8l/2VNR5c9lwUjmSDb7MuEAVF5h8VXQU=" }, "src/third_party/openscreen/src/buildtools": { "url": "https://chromium.googlesource.com/chromium/src/buildtools", @@ -576,13 +576,13 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "ca83e69429af8f0bfa34b22dc54f538b9eebf5c5", - "hash": "sha256-6gsur+fx546YJn/PUOOthuj+XrSIruVUeAYl4nRI6xM=" + "rev": "c82c611f105c0df064cc8c76363578caf9eafb75", + "hash": "sha256-kcrWcvbbGgQTfGypJ2EaLunYtSipJJRAin2jHunZoCU=" }, "src/third_party/perfetto": { "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git", - "rev": "054635b91453895720951f7329619d003a98b3e4", - "hash": "sha256-2jKRhHLitR0m2a4/asvVvTqAOhUlyLsBBSjpQAer4GA=" + "rev": "f35ae1939989c58c29df43f9c2d8610f5b932715", + "hash": "sha256-SyYTZnNar6F6/k6PGrkRan3l9hAikEVRciDQQaR7Jvs=" }, "src/third_party/protobuf-javascript/src": { "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript", @@ -591,8 +591,8 @@ }, "src/third_party/pthreadpool/src": { "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git", - "rev": "4e1831c02c74334a35ead03362f3342b6cea2a86", - "hash": "sha256-mB1QaAuY8vfv8FasPyio1AF75iYH+dM8t1GIr0Ty/+g=" + "rev": "290ee6fff0c36614702d6b297c148e3fa08e056a", + "hash": "sha256-jRHF7vZPmh70jNFVukfWzVnA2dBLSDSnMWVyZ9e08n4=" }, "src/third_party/pyelftools": { "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", @@ -621,13 +621,13 @@ }, "src/third_party/search_engines_data/resources": { "url": "https://chromium.googlesource.com/external/search_engines_data.git", - "rev": "07834ba1e5ebfb333d0b73556b7c4d62a53cb455", - "hash": "sha256-DTz351NpoygQLESm/z+fzFc/KGJyQelLnWpzNMmNT9o=" + "rev": "be408bdc2c1501ef25206145a49dcebb98db34b5", + "hash": "sha256-XlAE782PsEysPVIBM/Q8VdE9XnvoYUVaeMmUUoYFgvM=" }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "bcce46ca33b67cc302dd53927a63013b8f53bf73", - "hash": "sha256-ei95CJRfNPrsYt8XcDi7Pnl5dGiJu3qs7R4rAcZ24Uc=" + "rev": "0dfd95a49aed617f242c8b06dd5b255d1cb07776", + "hash": "sha256-HBqkqEoyQo3KuRCwP5NW9kuY9maaBYSpjA1lcBdFjxk=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -646,8 +646,8 @@ }, "src/third_party/swiftshader": { "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "4982425ff1bdcb2ce52a360edde58a379119bfde", - "hash": "sha256-QTGU9Dgc6rgMeFZvhZyYeYj5W+ClJO8Yfa4+K7TmEec=" + "rev": "7905fa19e456df5aa8e2233a7ec5832c9c6c287b", + "hash": "sha256-Wi8mttxM1fuLqrL2q6qPnpmyAfmDqJGA8Wub+yexFLA=" }, "src/third_party/text-fragments-polyfill/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", @@ -656,18 +656,18 @@ }, "src/third_party/tflite/src": { "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "c8ed430d092acd485f00e7a9d7a888a0857d0430", - "hash": "sha256-S5zkpQZdhRdnZRUrUfi5FCrF2XFe3y/adAWwfh1OQYE=" + "rev": "42d6877b1aa1cf324eb03ccf9b13511400341deb", + "hash": "sha256-KummGT7CUoGd3lCGXvtSFcFD1FhSlJXDcEi1WKUza70=" }, "src/third_party/vulkan-deps": { "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "1648e664337ca19a4f8679cbb9547a5b4b926995", - "hash": "sha256-CI0X6zbRV/snGcQZOUKQFn8Zo6D6Out6nN027HGZaa8=" + "rev": "96793fb0ff6fb5d4328cc6f71d84f5cb2d835daf", + "hash": "sha256-rAtsw8JV8EwrNzjK5p7JbWQa6fHfpByvZcP71hHC8uM=" }, "src/third_party/glslang/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "e57f993cff981c8c3ffd38967e030f04d13781a9", - "hash": "sha256-nr7pGPNPMbmL/XnL27M4m5in8qnCDcpNtVsxBAc7zms=" + "rev": "fc9889c889561c5882e83819dcaffef5ed45529b", + "hash": "sha256-HwFP4KJuA+BMQVvBWV0BCRj9U5I3CLEU+5bBtde2f6w=" }, "src/third_party/spirv-cross/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", @@ -676,38 +676,38 @@ }, "src/third_party/spirv-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "8c88e0c4c94a21de825efccba5f99a862b049825", - "hash": "sha256-s0Pe7kg5syKhK8qEZH8b7UCDa87Xk32Lh95cQbpLdAc=" + "rev": "bab63ff679c41eb75fc67dac76e1dc44426101e1", + "hash": "sha256-hi4vCwdCnwuYodUYq75niCZt2t9lERQH6529/R+7nH8=" }, "src/third_party/spirv-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "2e83ad7e6f2cc51f7eaff3ffeb10e34351b3c157", - "hash": "sha256-u4WDbWywua71yWB1cVIt1IDZRe4NnT5bUq3yHLKBgPo=" + "rev": "8e9165a3d162967a424dcf2ff645a98b50381cce", + "hash": "sha256-GsoaeO3FMzMtMStg1Wp0KUHU3Xxmmr7t3lDyu0ervNk=" }, "src/third_party/vulkan-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "78c359741d855213e8685278eb81bb62599f8e56", - "hash": "sha256-VqKQeJd81feSgYnYLqb2sYirCmnHN9Rr19/4cPZ2TzE=" + "rev": "e2e53a724677f6eba8ff0ce1ccb64ee321785cbd", + "hash": "sha256-lIuJ50zi9UIMrP/FePI8jHFhJ5LsKhthDY4gIHeZNpo=" }, "src/third_party/vulkan-loader/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "723d6b4aa35853315c6e021ec86388b3a2559fae", - "hash": "sha256-tDW5ed6gsDKlCKf4gT8MNi1yaafocUTohL1upGKB+Cc=" + "rev": "fb78607414e154c7a5c01b23177ba719c8a44909", + "hash": "sha256-CeIjyW90Ri0MvhyFfYgss5Rjh5fHKhQf7CgBEcB/nPk=" }, "src/third_party/vulkan-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "289efccc7560f2b970e2b4e0f50349da87669311", - "hash": "sha256-Cw7LWBPRbDVlfmeMM4CYEC9xbfqT1wV7yuUcpGMLahs=" + "rev": "0b8196724e4ad28cc7459b82a9b75f252c08cb3e", + "hash": "sha256-oL4lyUH26eO6eJy7EQmuXdt4oy3eQ65fribfMSOZV+8=" }, "src/third_party/vulkan-utility-libraries/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "0d5b49b80f17bca25e7f9321ad4e671a56f70887", - "hash": "sha256-NdvjtdCrNVKY23B4YDL33KB+/9HsSWTVolZJOto8+pc=" + "rev": "4e246c56ec5afb5ad66b9b04374d39ac04675c8e", + "hash": "sha256-MmC4UVa9P/0h7r8IBp1LhP9EztwyZv/ASWKKj8Gk1T8=" }, "src/third_party/vulkan-validation-layers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "73d7d74bc979c8a16c823c4eae4ee881153e000a", - "hash": "sha256-2GII+RBRzPZTTib82srUEFDG+CbtPTZ6lX3oDJBC2gU=" + "rev": "cea6ec1cdd37494c1f0fc5619c6c356ac33372fb", + "hash": "sha256-iXQZ6Qpe0li+QeThxMUCn45OufZ8W/qJcejpMb4/gWc=" }, "src/third_party/vulkan_memory_allocator": { "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", @@ -716,8 +716,8 @@ }, "src/third_party/wasm_tts_engine/src": { "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine", - "rev": "53d2aba6f0cf7db57e17edfc3ff6471871b0c125", - "hash": "sha256-t5eeehwspRLaowEMPLa8/lV5AHamXQBfH/un0DHLVAM=" + "rev": "352880bb49e2410707543c252ef6b94a21b0f47f", + "hash": "sha256-TFkniS4XvP0RlPnI1lv4RxxSY44RUuwCMKmmybENEBw=" }, "src/third_party/wayland/src": { "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", @@ -751,8 +751,8 @@ }, "src/third_party/webgpu-cts/src": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "92f4eb4dae0f5439f2cdc7ce467d66b10e165f42", - "hash": "sha256-vXyp0+6eyKOzzQbkRa8f8dO+B9cyUCY2hCZEFc7+7lU=" + "rev": "168536ad91bff176bbe31ae692d97f8bfe9fb86d", + "hash": "sha256-HB16HM4Gj+2F26tyN393VmHbGxvKOZ+M949059odN/4=" }, "src/third_party/webpagereplay": { "url": "https://chromium.googlesource.com/webpagereplay.git", @@ -761,8 +761,8 @@ }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "2c8f5be6924d507ee74191b1aeadcec07f747f21", - "hash": "sha256-cNONf88oSbsdYuSdPiLxgTI973qOP6fb1OKb2WMQMMg=" + "rev": "cec4daea7ed5da94fc38d790bd12694c86865447", + "hash": "sha256-mxRckkiBIpQp2Qxj6fcer3jDftp3wlg+aO4BoUHhyiY=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -771,8 +771,8 @@ }, "src/third_party/weston/src": { "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git", - "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7", - "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=" + "rev": "4eb10b123b483327214d8da5da67e8bbeeaed8fe", + "hash": "sha256-VNHUAtfTB24SIf2kl+MMXF3rG5cJOPM93WU/sVSIQ1A=" }, "src/third_party/xdg-utils": { "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git", @@ -781,18 +781,18 @@ }, "src/third_party/xnnpack/src": { "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "d6fc3be20b0d3e3742157fa26c5359babaa8bc8b", - "hash": "sha256-p5DjGNH9IR0KPWSFmbsdt2PU+kHgWRAnBw7J9sLV/S8=" + "rev": "474d7e58d4b8f4bd1a98ee74bc57858769f7d925", + "hash": "sha256-UO+nOh7R+3xTSxF2u8dIrv7qn/QmhnDr2J5Ciumj93M=" }, "src/third_party/zstd/src": { "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "ef2bf5781112a4cd6b62ac1817f7842bbdc7ea8f", - "hash": "sha256-hDDNrUXGxG/o1oZnypAnuLyIeM16Hy6x1KacGu9Hhmw=" + "rev": "d654fca78690fa15cceb8058ac47454d914a0e63", + "hash": "sha256-Ginvak0y1CjURT3mQZzdLn3MW9vXxC7T0KLsM6SHDV0=" }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "5297e56d91816747d539abca52b578e5832135f0", - "hash": "sha256-Fi4pl6xSXkHF4XaQNfNzULVjQZSzDfaHFIyIxH103go=" + "rev": "44fdd9108308773dd3f4fa040de5f4f75edf671f", + "hash": "sha256-BkLOmb97p2NcAIuQiDjIoVAe49h9iv79rC5G8wyD1as=" } } }, diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 8b2610cf88b6..61e77bba6824 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -32,13 +32,13 @@ assert !(pulseaudioSupport && portaudioSupport); gnuradioMinimal.pkgs.mkDerivation rec { pname = "gqrx"; - version = "2.17.6"; + version = "2.17.7"; src = fetchFromGitHub { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - hash = "sha256-/ykKcwOotu8kn+EpJI+EUeqSkHZ2IrSh+o7lBGeHrZ0="; + hash = "sha256-uvKIxppnNkQge0QE5d1rw0qKo1fT8jwJPTiHilYaT28="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/danger-gitlab/Gemfile.lock b/pkgs/applications/version-management/danger-gitlab/Gemfile.lock index d68ec3108ca2..230297e9357e 100644 --- a/pkgs/applications/version-management/danger-gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/danger-gitlab/Gemfile.lock @@ -1,9 +1,11 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - claide (1.0.3) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + base64 (0.2.0) + bigdecimal (3.1.9) + claide (1.1.0) claide-plugins (0.9.2) cork nap @@ -11,82 +13,77 @@ GEM colored2 (3.1.2) cork (0.3.0) colored2 (~> 3.1) - danger (8.3.1) + csv (3.3.4) + danger (9.5.1) + base64 (~> 0.2) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) cork (~> 0.1) - faraday (>= 0.9.0, < 2.0) + faraday (>= 0.9.0, < 3.0) faraday-http-cache (~> 2.0) - git (~> 1.7) + git (~> 1.13) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) - no_proxy_fix - octokit (~> 4.7) + octokit (>= 4.0) + pstore (~> 0.1) terminal-table (>= 1, < 4) - danger-gitlab (8.0.0) + danger-gitlab (9.0.0) danger - gitlab (~> 4.2, >= 4.2.0) - faraday (1.7.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-http-cache (2.2.0) + gitlab (~> 5.0) + faraday (2.13.1) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-http-cache (2.5.1) faraday (>= 0.8) - faraday-httpclient (1.0.1) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - git (1.9.1) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + git (1.19.1) + addressable (~> 2.8) rchardet (~> 1.8) - gitlab (4.17.0) - httparty (~> 0.18) - terminal-table (~> 1.5, >= 1.5.1) - httparty (0.18.1) - mime-types (~> 3.0) + gitlab (5.1.0) + base64 (~> 0.2.0) + httparty (~> 0.20) + terminal-table (>= 1.5.1) + httparty (0.23.1) + csv + mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) - kramdown (2.3.1) - rexml + json (2.12.0) + kramdown (2.5.1) + rexml (>= 3.3.9) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - mime-types (3.3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2021.0704) - multi_xml (0.6.0) - multipart-post (2.1.1) + logger (1.7.0) + mini_mime (1.1.5) + multi_xml (0.7.2) + bigdecimal (~> 3.1) nap (1.1.0) - no_proxy_fix (0.1.2) - octokit (4.21.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) + net-http (0.6.0) + uri + octokit (10.0.0) + faraday (>= 1, < 3) + sawyer (~> 0.9) open4 (1.3.4) - public_suffix (4.0.6) - rchardet (1.8.0) - rexml (3.2.5) - ruby2_keywords (0.0.5) - sawyer (0.8.2) + pstore (0.2.0) + public_suffix (6.0.2) + rchardet (1.9.0) + rexml (3.4.1) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) - unicode-display_width (1.7.0) + faraday (>= 0.17.3, < 3) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + unicode-display_width (2.6.0) + uri (1.0.3) PLATFORMS ruby + x86_64-linux DEPENDENCIES danger-gitlab BUNDLED WITH - 2.1.4 + 2.5.22 diff --git a/pkgs/applications/version-management/danger-gitlab/gemset.nix b/pkgs/applications/version-management/danger-gitlab/gemset.nix index 70b12e0d609f..2f47e820eb89 100644 --- a/pkgs/applications/version-management/danger-gitlab/gemset.nix +++ b/pkgs/applications/version-management/danger-gitlab/gemset.nix @@ -5,20 +5,40 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.7"; + }; + base64 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + bigdecimal = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; + type = "gem"; + }; + version = "3.1.9"; }; claide = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; + sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; claide-plugins = { dependencies = [ @@ -56,8 +76,19 @@ }; version = "0.3.0"; }; + csv = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1kfqg0m6vqs6c67296f10cr07im5mffj90k2b5dsm51liidcsvp9"; + type = "gem"; + }; + version = "3.3.4"; + }; danger = { dependencies = [ + "base64" "claide" "claide-plugins" "colored2" @@ -67,18 +98,18 @@ "git" "kramdown" "kramdown-parser-gfm" - "no_proxy_fix" "octokit" + "pstore" "terminal-table" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12nmycrlwr8ca2s0fx76k81gjw12iz15k1n0qanszv5d4l1ykj2l"; + sha256 = "0s6liclz7vn2q1vzraq7gq6n2rfj4p3hn2gixgnx2qvggg2qsai1"; type = "gem"; }; - version = "8.3.1"; + version = "9.5.1"; }; danger-gitlab = { dependencies = [ @@ -89,62 +120,25 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1a530kx5s5rbx5yx3jqay56lkksqh0yj468hcpg16faiyv8dfza9"; + sha256 = "0bmsyv03n2ravjc0mzq73iairgc1apzc388jalg2c3rag1psgr47"; type = "gem"; }; - version = "8.0.0"; + version = "9.0.0"; }; faraday = { dependencies = [ - "faraday-em_http" - "faraday-em_synchrony" - "faraday-excon" - "faraday-httpclient" "faraday-net_http" - "faraday-net_http_persistent" - "faraday-patron" - "faraday-rack" - "multipart-post" - "ruby2_keywords" + "json" + "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0r6ik2yvsbx6jj30vck32da2bbvj4m0gf4jhp09vr75i1d6jzfvb"; + sha256 = "0xbv450qj2bx0qz9l2pjrd3kc057y6bglc3na7a78zby8ssiwlyc"; type = "gem"; }; - version = "1.7.0"; - }; - faraday-em_http = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-em_synchrony = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-excon = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; - type = "gem"; - }; - version = "1.1.0"; + version = "2.13.1"; }; faraday-http-cache = { dependencies = [ "faraday" ]; @@ -152,74 +146,39 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lhfwlk4mhmw9pdlgdsl2bq4x45w7s51jkxjryf18wym8iiw36g7"; + sha256 = "10wld3vk3i8zsr3pa9zyjiyi2zlyyln872812f08bbg1hnd15z6b"; type = "gem"; }; - version = "2.2.0"; - }; - faraday-httpclient = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; - type = "gem"; - }; - version = "1.0.1"; + version = "2.5.1"; }; faraday-net_http = { + dependencies = [ "net-http" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1"; type = "gem"; }; - version = "1.0.1"; - }; - faraday-net_http_persistent = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; - type = "gem"; - }; - version = "1.2.0"; - }; - faraday-patron = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-rack = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; - type = "gem"; - }; - version = "1.0.0"; + version = "3.4.0"; }; git = { - dependencies = [ "rchardet" ]; + dependencies = [ + "addressable" + "rchardet" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0s6426k24ph44kbx1qb16ciar170iczs8ivyl29ckin2ygmrrlvm"; + sha256 = "0w3xhay1z7qx9ab04wmy5p4f1fadvqa6239kib256wsiyvcj595h"; type = "gem"; }; - version = "1.9.1"; + version = "1.19.1"; }; gitlab = { dependencies = [ + "base64" "httparty" "terminal-table" ]; @@ -227,24 +186,35 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00p8z8sxk78zik2dwdhflkvaynp5ximy2xc8cw6bz93gkr1xy8n3"; + sha256 = "1ivj6pq3s3lz8z0islynvdb3fv82ghr5k97drz07kwwqga02f702"; type = "gem"; }; - version = "4.17.0"; + version = "5.1.0"; }; httparty = { dependencies = [ - "mime-types" + "csv" + "mini_mime" "multi_xml" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "17gpnbf2a7xkvsy20jig3ljvx8hl5520rqm9pffj2jrliq1yi3w7"; + sha256 = "0mbbjr774zxb2wcpbwc93l0i481bxk7ga5hpap76w3q1y9idvh9s"; type = "gem"; }; - version = "0.18.1"; + version = "0.23.1"; + }; + json = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l0av82l1i5703fd5qnxr263zw21xmbpx737av3r9pjn0w0cw3xk"; + type = "gem"; + }; + version = "2.12.0"; }; kramdown = { dependencies = [ "rexml" ]; @@ -252,10 +222,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jdbcjv4v7sj888bv3vc6d1dg4ackkh7ywlmn9ln2g9alk7kisar"; + sha256 = "131nwypz8b4pq1hxs6gsz3k00i9b75y3cgpkq57vxknkv6mvdfw7"; type = "gem"; }; - version = "2.3.1"; + version = "2.5.1"; }; kramdown-parser-gfm = { dependencies = [ "kramdown" ]; @@ -268,46 +238,36 @@ }; version = "1.1.0"; }; - mime-types = { - dependencies = [ "mime-types-data" ]; + logger = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; type = "gem"; }; - version = "3.3.1"; + version = "1.7.0"; }; - mime-types-data = { + mini_mime = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dlxwc75iy0dj23x824cxpvpa7c8aqcpskksrmb32j6m66h5mkcy"; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; type = "gem"; }; - version = "3.2021.0704"; + version = "1.1.5"; }; multi_xml = { + dependencies = [ "bigdecimal" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; + sha256 = "1kl7ax7zcj8czlxs6vn3kdhpnz1dwva4y5zwnavssfv193f9cyih"; type = "gem"; }; - version = "0.6.0"; - }; - multipart-post = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; - type = "gem"; - }; - version = "2.1.1"; + version = "0.7.2"; }; nap = { groups = [ "default" ]; @@ -319,15 +279,16 @@ }; version = "1.1.0"; }; - no_proxy_fix = { + net-http = { + dependencies = [ "uri" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "006dmdb640v1kq0sll3dnlwj1b0kpf3i1p27ygyffv8lpcqlr6sf"; + sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; type = "gem"; }; - version = "0.1.2"; + version = "0.6.0"; }; octokit = { dependencies = [ @@ -338,10 +299,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ak64rb48d8z98nw6q70r6i0i3ivv61iqla40ss5l79491qfnn27"; + sha256 = "1s14kbjfm9vdvcrwqdarfdbfsjqs1jxpglp60plvfdvnkd9rmsc2"; type = "gem"; }; - version = "4.21.0"; + version = "10.0.0"; }; open4 = { groups = [ "default" ]; @@ -353,45 +314,45 @@ }; version = "1.3.4"; }; + pstore = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1a3lrq8k62n8bazhxgdmjykni9wv0mcjks5vi1g274i3wblcgrfn"; + type = "gem"; + }; + version = "0.2.0"; + }; public_suffix = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz"; type = "gem"; }; - version = "4.0.6"; + version = "6.0.2"; }; rchardet = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; + sha256 = "1455yhd1arccrns3ghhvn4dl6gnrf4zn1xxsaa33ffyqrn399216"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.0"; }; rexml = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; type = "gem"; }; - version = "3.2.5"; - }; - ruby2_keywords = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; - type = "gem"; - }; - version = "0.0.5"; + version = "3.4.1"; }; sawyer = { dependencies = [ @@ -402,10 +363,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; + sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps"; type = "gem"; }; - version = "0.8.2"; + version = "0.9.2"; }; terminal-table = { dependencies = [ "unicode-display_width" ]; @@ -413,19 +374,29 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr"; type = "gem"; }; - version = "1.8.0"; + version = "3.0.2"; }; unicode-display_width = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; type = "gem"; }; - version = "1.7.0"; + version = "2.6.0"; + }; + uri = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9"; + type = "gem"; + }; + version = "1.0.3"; }; } diff --git a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix index e59fce3b9cec..618d40b2006c 100644 --- a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix +++ b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix @@ -7,14 +7,14 @@ }: buildLua (finalAttrs: { pname = "modernx-zydezu"; - version = "0.4.1"; + version = "0.4.2"; scriptPath = "modernx.lua"; src = fetchFromGitHub { owner = "zydezu"; repo = "ModernX"; rev = finalAttrs.version; - hash = "sha256-tm1vsHEFX2YnQ1w3DcLd/zHASetkqQ4wYcYT9w8HVok="; + hash = "sha256-7DkW3b0YEkV4VPURcg4kkUy8pSTFFb8jaJOuEtzTDow="; }; postInstall = '' diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 8019aa4a8b3a..4da72ab45f92 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -30,6 +30,8 @@ obs-composite-blur = callPackage ./obs-composite-blur.nix { }; + obs-dvd-screensaver = callPackage ./obs-dvd-screensaver.nix { }; + obs-freeze-filter = qt6Packages.callPackage ./obs-freeze-filter.nix { }; obs-gradient-source = callPackage ./obs-gradient-source.nix { }; @@ -40,6 +42,8 @@ obs-livesplit-one = callPackage ./obs-livesplit-one { }; + obs-media-controls = qt6Packages.callPackage ./obs-media-controls.nix { }; + obs-move-transition = callPackage ./obs-move-transition.nix { }; obs-multi-rtmp = qt6Packages.callPackage ./obs-multi-rtmp { }; @@ -48,16 +52,22 @@ obs-ndi = qt6Packages.callPackage ./obs-ndi { }; + obs-noise = callPackage ./obs-noise.nix { }; + obs-nvfbc = callPackage ./obs-nvfbc.nix { }; obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix { }; + obs-recursion-effect = callPackage ./obs-recursion-effect.nix { }; + obs-replay-source = qt6Packages.callPackage ./obs-replay-source.nix { }; - obs-rgb-levels-filter = callPackage ./obs-rgb-levels-filter.nix { }; + obs-rgb-levels = callPackage ./obs-rgb-levels.nix { }; obs-scale-to-sound = callPackage ./obs-scale-to-sound.nix { }; + obs-scene-as-transition = callPackage ./obs-scene-as-transition.nix { }; + obs-shaderfilter = qt6Packages.callPackage ./obs-shaderfilter.nix { }; obs-source-clone = callPackage ./obs-source-clone.nix { }; @@ -66,6 +76,8 @@ obs-source-switcher = callPackage ./obs-source-switcher.nix { }; + obs-stroke-glow-shadow = callPackage ./obs-stroke-glow-shadow.nix { }; + obs-teleport = callPackage ./obs-teleport { }; obs-text-pthread = callPackage ./obs-text-pthread.nix { }; @@ -74,6 +86,8 @@ obs-tuna = qt6Packages.callPackage ./obs-tuna { }; + obs-urlsource = qt6Packages.callPackage ./obs-urlsource.nix { }; + obs-vaapi = callPackage ./obs-vaapi { }; obs-vertical-canvas = qt6Packages.callPackage ./obs-vertical-canvas.nix { }; @@ -88,6 +102,8 @@ obs-webkitgtk = callPackage ./obs-webkitgtk.nix { }; + pixel-art = callPackage ./pixel-art.nix { }; + wlrobs = callPackage ./wlrobs.nix { }; waveform = callPackage ./waveform { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-dvd-screensaver.nix b/pkgs/applications/video/obs-studio/plugins/obs-dvd-screensaver.nix new file mode 100644 index 000000000000..ab7e6891b067 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-dvd-screensaver.nix @@ -0,0 +1,30 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + obs-studio, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "obs-dvd-screensaver"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "wimpysworld"; + repo = "obs-dvd-screensaver"; + tag = "${finalAttrs.version}"; + hash = "sha256-uZdFP3TULECzYNKtwaxFIcFYeFYdEoJ+ZKAqh9y9MEo="; + }; + strictDeps = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio ]; + + meta = { + description = "DVD screen saver for OBS Studio"; + homepage = "https://github.com/wimpysworld/obs-dvd-screensaver"; + maintainers = with lib.maintainers; [ flexiondotorg ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix b/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix new file mode 100644 index 000000000000..39868bc33002 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + obs-studio, + qtbase, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "obs-media-controls"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "exeldro"; + repo = "obs-media-controls"; + tag = "${finalAttrs.version}"; + hash = "sha256-r9fqpg0G9rzGSqq5FUS8ul58rj0796aGZIND8PCJ9jk="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + obs-studio + qtbase + ]; + + dontWrapQtApps = true; + + postInstall = '' + rm -rf $out/obs-plugins $out/data + ''; + + meta = { + description = "Plugin for OBS Studio to add a Media Controls dock."; + homepage = "https://github.com/exeldro/obs-media-controls"; + maintainers = with lib.maintainers; [ flexiondotorg ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-noise.nix b/pkgs/applications/video/obs-studio/plugins/obs-noise.nix new file mode 100644 index 000000000000..e40348455940 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-noise.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + obs-studio, +}: + +stdenv.mkDerivation rec { + pname = "obs-noise"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "FiniteSingularity"; + repo = "obs-noise"; + rev = "v${version}"; + sha256 = "sha256-D9vGXCrmQ8IDRmL8qZ1ZBiOz9AjhKm45W37zC16kRCk="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio ]; + + postFixup = '' + mv $out/data/obs-plugins/${pname}/shaders $out/share/obs/obs-plugins/${pname}/ + rm -rf $out/data $out/obs-plugins + ''; + + meta = with lib; { + description = "A plug-in for noise generation and noise effects for OBS."; + homepage = "https://github.com/FiniteSingularity/obs-noise"; + maintainers = with maintainers; [ flexiondotorg ]; + license = licenses.gpl2Only; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; + }; +} diff --git a/pkgs/applications/video/obs-studio/plugins/obs-recursion-effect.nix b/pkgs/applications/video/obs-studio/plugins/obs-recursion-effect.nix new file mode 100644 index 000000000000..2158ce22db16 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-recursion-effect.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + obs-studio, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "obs-recursion-effect"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "exeldro"; + repo = "obs-recursion-effect"; + tag = "${finalAttrs.version}"; + hash = "sha256-PeWJy423QbX4NULuS15LJ/IR/W+tXCJD9TjZdJOGk6A="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio ]; + + # Fix OBS API deprecations warnings + patches = [ + (fetchpatch { + url = "https://github.com/exeldro/obs-recursion-effect/commit/889a8484d5c0eb33267b44ccda545a8fadc189a5.diff"; + hash = "sha256-J2GnsoPUTqvEkuBuAae2TrxXMQg0Sm3dq75ZjGN65IE="; + }) + ]; + + postInstall = '' + rm -rf $out/obs-plugins $out/data + ''; + + meta = { + description = "Plugin for OBS Studio to add recursion effect to a source using a filter"; + homepage = "https://github.com/exeldro/obs-recursion-effect"; + maintainers = with lib.maintainers; [ flexiondotorg ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix index b589a6639332..8279fee497f9 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix @@ -3,44 +3,35 @@ lib, fetchFromGitHub, cmake, - libcaption, obs-studio, - qtbase, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation rec { pname = "obs-replay-source"; version = "1.8.1"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-replay-source"; - tag = finalAttrs.version; - hash = "sha256-+PSALDqHXPyR0J7YnLn3QgPN6eIoH3yTIm1Bp7Li8c8="; + rev = version; + sha256 = "sha256-+PSALDqHXPyR0J7YnLn3QgPN6eIoH3yTIm1Bp7Li8c8="; }; nativeBuildInputs = [ cmake ]; - - buildInputs = [ - libcaption - obs-studio - qtbase - ]; + buildInputs = [ obs-studio ]; postInstall = '' - mkdir -p $out/lib $out/share - mv $out/obs-plugins/64bit $out/lib/obs-plugins - rm -rf $out/obs-plugins - mv $out/data $out/share/obs + rm -rf $out/obs-plugins $out/data ''; - dontWrapQtApps = true; - - meta = { + meta = with lib; { description = "Replay source for OBS studio"; homepage = "https://github.com/exeldro/obs-replay-source"; - license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ pschmitt ]; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ + flexiondotorg + pschmitt + ]; }; -}) +} diff --git a/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels.nix similarity index 50% rename from pkgs/applications/video/obs-studio/plugins/obs-rgb-levels-filter.nix rename to pkgs/applications/video/obs-studio/plugins/obs-rgb-levels.nix index f51d7963089a..3779e14e4aee 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels-filter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels.nix @@ -7,28 +7,24 @@ }: stdenv.mkDerivation rec { - pname = "obs-rgb-levels-filter"; - version = "1.0.0"; + pname = "obs-rgb-levels"; + version = "1.0.2"; src = fetchFromGitHub { owner = "wimpysworld"; - repo = "obs-rgb-levels-filter"; + repo = "obs-rgb-levels"; rev = version; - sha256 = "sha256-QREwK9nBhjCBFslXUj9bGUGPgfEns8QqlgP5e2O/0oU="; + sha256 = "sha256-W79KUUUodlARlIMg/DaN+fxq/NEkp4k8MuEOHrJTbCk="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio ]; - cmakeFlags = [ - "-DOBS_SRC_DIR=${obs-studio.src}" - ]; - meta = with lib; { - description = "Simple OBS Studio filter to adjust RGB levels"; - homepage = "https://github.com/wimpysworld/obs-rgb-levels-filter"; + description = "A simple OBS Studio filter to adjust RGB levels."; + homepage = "https://github.com/wimpysworld/obs-rgb-levels"; maintainers = with maintainers; [ flexiondotorg ]; - license = licenses.gpl2Plus; + license = licenses.gpl2Only; platforms = [ "x86_64-linux" "i686-linux" diff --git a/pkgs/applications/video/obs-studio/plugins/obs-scene-as-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-scene-as-transition.nix new file mode 100644 index 000000000000..cb1e41b6d286 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-scene-as-transition.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + obs-studio, +}: + +stdenv.mkDerivation rec { + pname = "obs-scene-as-transition"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "andilippi"; + repo = "obs-scene-as-transition"; + rev = "v${version}"; + sha256 = "sha256-qeiJR68MqvhpzvY7yNnR6w77SvavlZTdbnGBWrd7iZM="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio ]; + + postInstall = '' + rm -rf $out/obs-plugins $out/data + ''; + + meta = with lib; { + description = "An OBS Studio plugin that will allow you to use a Scene as a transition"; + homepage = "https://github.com/andilippi/obs-scene-as-transition"; + maintainers = with maintainers; [ flexiondotorg ]; + license = licenses.gpl2Plus; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; + }; +} diff --git a/pkgs/applications/video/obs-studio/plugins/obs-stroke-glow-shadow.nix b/pkgs/applications/video/obs-studio/plugins/obs-stroke-glow-shadow.nix new file mode 100644 index 000000000000..5865f595a38e --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-stroke-glow-shadow.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + obs-studio, +}: + +stdenv.mkDerivation rec { + pname = "obs-stroke-glow-shadow"; + version = "v1.5.2"; + + src = fetchFromGitHub { + owner = "FiniteSingularity"; + repo = "obs-stroke-glow-shadow"; + rev = version; + sha256 = "sha256-+2hb4u+6UG7IV9pAvPjp4wvDYhYnxe98U5QQjUcdD/k="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio ]; + + postFixup = '' + rm -rf $out/obs-plugins + rm -rf $out/data + ''; + + meta = with lib; { + description = "An OBS plugin to provide efficient Stroke, Glow, and Shadow effects on masked sources."; + homepage = "https://github.com/FiniteSingularity/obs-stroke-glow-shadow"; + maintainers = with maintainers; [ flexiondotorg ]; + license = licenses.gpl2Only; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; + }; +} diff --git a/pkgs/applications/video/obs-studio/plugins/obs-urlsource.nix b/pkgs/applications/video/obs-studio/plugins/obs-urlsource.nix new file mode 100644 index 000000000000..0ced62150e21 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-urlsource.nix @@ -0,0 +1,98 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, + git, + obs-studio, + pugixml, + qtbase, + writeScript, +}: + +let + websocketpp = fetchFromGitHub { + owner = "zaphoyd"; + repo = "websocketpp"; + rev = "0.8.2"; + sha256 = "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM="; + }; + + lexbor = fetchFromGitHub { + owner = "lexbor"; + repo = "lexbor"; + rev = "v2.3.0"; + sha256 = "sha256-s5fZWBhXC0fuHIUk1YX19bHagahOtSLlKQugyHCIlgI="; + }; + + asio = fetchFromGitHub { + owner = "chriskohlhoff"; + repo = "asio"; + rev = "asio-1-28-0"; + sha256 = "sha256-dkiUdR8FgDnnqdptaJjE4rvNlgpC5HZl6SQQ5Di2C2s="; + }; +in +stdenv.mkDerivation rec { + pname = "obs-urlsource"; + version = "0.3.7"; + + src = fetchFromGitHub { + owner = "locaal-ai"; + repo = "obs-urlsource"; + rev = version; + sha256 = "sha256-ZWwD8jJkL1rAUeanD4iChcgpnJaC5pPo36Ot36XOSx8="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + git + ]; + buildInputs = [ + curl + obs-studio + pugixml + qtbase + ]; + dontWrapQtApps = true; + + # Update websocketpp and lexabor configurations to use pre-fetched sources + postPatch = '' + sed -i 's|URL .*|SOURCE_DIR "${websocketpp}"\n DOWNLOAD_COMMAND ""|' cmake/FetchWebsocketpp.cmake + sed -i \ + -e 's|GIT_REPOSITORY .*|SOURCE_DIR "${lexbor}"|' \ + -e 's|GIT_TAG .*|DOWNLOAD_COMMAND ""\n UPDATE_COMMAND ""|' \ + cmake/BuildLexbor.cmake + ''; + + postInstall = '' + rm -rf $out/lib/cmake + ''; + + NIX_CFLAGS_COMPILE = [ + "-I${websocketpp}" + "-I${asio}/asio/include" + ]; + + cmakeFlags = [ + # Prevent deprecation warnings from failing the build + (lib.cmakeOptionType "string" "CMAKE_CXX_FLAGS" "-Wno-error=deprecated-declarations") + (lib.cmakeBool "ENABLE_QT" true) + (lib.cmakeBool "USE_SYSTEM_CURL" true) + (lib.cmakeBool "USE_SYSTEM_PUGIXML" true) + (lib.cmakeBool "CMAKE_COMPILE_WARNING_AS_ERROR" false) + "-Wno-dev" + ]; + + meta = with lib; { + description = "OBS plugin to fetch data from a URL or file, connect to an API or AI service, parse responses and display text, image or audio on scene"; + homepage = "https://github.com/locaal-ai/obs-urlsource"; + maintainers = with maintainers; [ flexiondotorg ]; + license = licenses.gpl2Only; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; + }; +} diff --git a/pkgs/applications/video/obs-studio/plugins/pixel-art.nix b/pkgs/applications/video/obs-studio/plugins/pixel-art.nix new file mode 100644 index 000000000000..dd01049e6802 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/pixel-art.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + obs-studio, +}: + +stdenv.mkDerivation rec { + pname = "pixel-art"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "dspstanky"; + repo = "pixel-art"; + rev = version; + sha256 = "sha256-7o63e7nK/JsK2SQg0AzUYcc4ZsPx0lt8gtAQm8Zy+9w="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio ]; + + meta = with lib; { + description = "An OBS Plugin that can be used to create retro-inspired pixel art visuals."; + homepage = "https://github.com/dspstanky/pixel-art"; + maintainers = with maintainers; [ flexiondotorg ]; + license = licenses.gpl2Only; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; + }; +} diff --git a/pkgs/by-name/av/avizo/package.nix b/pkgs/by-name/av/avizo/package.nix index 47a44f05aa73..cbec1c25b6b2 100644 --- a/pkgs/by-name/av/avizo/package.nix +++ b/pkgs/by-name/av/avizo/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "avizo"; - version = "1.3"; + version = "1.3-unstable-2024-11-03"; src = fetchFromGitHub { owner = "misterdanb"; repo = "avizo"; - rev = version; - sha256 = "sha256-Vj8OrNlAstl0AXTeVAPdEf5JgnAmJwl9s3Jdc0ZiYQc="; + rev = "5efaa22968b2cc1a3c15a304cac3f22ec2727b17"; + sha256 = "sha256-KYQPHVxjvqKt4d7BabplnrXP30FuBQ6jQ1NxzR5U7qI="; }; nativeBuildInputs = [ @@ -59,6 +59,9 @@ stdenv.mkDerivation rec { homepage = "https://github.com/misterdanb/avizo"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.berbiche ]; + maintainers = [ + maintainers.berbiche + maintainers.flexiondotorg + ]; }; } diff --git a/pkgs/by-name/ca/cargo-tauri/hook.nix b/pkgs/by-name/ca/cargo-tauri/hook.nix index bc1d57f52356..4683e5a2ac5c 100644 --- a/pkgs/by-name/ca/cargo-tauri/hook.nix +++ b/pkgs/by-name/ca/cargo-tauri/hook.nix @@ -42,7 +42,8 @@ makeSetupHook { ''; linux = '' - mv "$targetDir"/bundle/deb/*/data/usr $out + mkdir -p $out + mv "$targetDir"/bundle/deb/*/data/usr/* $out/ ''; } .${kernelName} or (throw "${kernelName} is not supported by cargo-tauri.hook"); diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix index 9f43b14131de..b154d6cc9a82 100644 --- a/pkgs/by-name/cb/cbmc/package.nix +++ b/pkgs/by-name/cb/cbmc/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cbmc"; - version = "6.4.1"; + version = "6.6.0"; src = fetchFromGitHub { owner = "diffblue"; repo = "cbmc"; tag = "cbmc-${finalAttrs.version}"; - hash = "sha256-O8aZTW+Eylshl9bmm9GzbljWB0+cj2liZHs2uScERkM="; + hash = "sha256-ot0vVBgiSVru/RE7KeyTsXzDfs0CSa5vaFsON+PCZZo="; }; srcglucose = fetchFromGitHub { @@ -51,12 +51,6 @@ stdenv.mkDerivation (finalAttrs: { cudd = cudd.src; }) ./0002-Do-not-download-sources-in-cmake.patch - # Fixes build with libc++ >= 19 due to the removal of std::char_traits. - # Remove for versions > 6.4.1. - (fetchpatch { - url = "https://github.com/diffblue/cbmc/commit/684bf4221c8737952e6469304f5a360dc3d5439d.patch"; - hash = "sha256-3hHu6FcyHjfeFjNxhyhxxk7I/SK98BXT+xy7NgtEt50="; - }) ]; postPatch = diff --git a/pkgs/by-name/ce/cerca/package.nix b/pkgs/by-name/ce/cerca/package.nix index b8787a7a47df..1a9134458728 100644 --- a/pkgs/by-name/ce/cerca/package.nix +++ b/pkgs/by-name/ce/cerca/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cerca"; - version = "0-unstable-2025-05-06"; + version = "0-unstable-2025-05-21"; src = fetchFromGitHub { owner = "cblgh"; repo = "cerca"; - rev = "a2706a35e3efc8b816b4374e24493548429041db"; - hash = "sha256-FDlASFjI+D/iOH0r2Yd638aS0na19TxkN7Z1kD/o/fY"; + rev = "722c38d96160ccf69dd7a8122b62660102b64a59"; + hash = "sha256-M5INnik/TIzH0Afi8/6/PnhwsAhd+kFaDHejfsmuhn0="; }; vendorHash = "sha256-yfsI0nKfzyzmtbS9bSHRaD2pEgxN6gOKAA/FRDxJx40="; diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix index 3d2016a256cd..555f0bc2fe80 100644 --- a/pkgs/by-name/co/containerd/package.nix +++ b/pkgs/by-name/co/containerd/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { pname = "containerd"; - version = "2.1.0"; + version = "2.1.1"; outputs = [ "out" @@ -27,7 +27,7 @@ buildGoModule rec { owner = "containerd"; repo = "containerd"; tag = "v${version}"; - hash = "sha256-5Fd9LrpJUf5MEtfQaRM6zo5C8RUsOasR2NHCDj8vMBk="; + hash = "sha256-ZqQX+bogzAsMvqYNKyWvHF2jdPOIhNQDizKEDbcbmOg="; }; postPatch = "patchShebangs ."; diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix index ab1f24407686..74ac889dda8a 100644 --- a/pkgs/by-name/co/containerlab/package.nix +++ b/pkgs/by-name/co/containerlab/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "containerlab"; - version = "0.67.0"; + version = "0.68.0"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-wTVGvaosHhQleRDytCdA1R4YKlzgGN4nWRZx6Ok+O3U="; + hash = "sha256-x6QDwduAMCD+Trj0awQXW0Tdleb2U6YBi/7mdMB6V/8="; }; - vendorHash = "sha256-Bba2Lt43I9jKg6zWhXWE0yJsVx7SlQ2GmrK++cZ9TrM="; + vendorHash = "sha256-XRgKfRw6VGg+lkbtPWUVNfAk5a7ZdFwVmhjtM7uSwHs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/co/convmv/package.nix b/pkgs/by-name/co/convmv/package.nix index 9670d85dcd64..50036f87495f 100644 --- a/pkgs/by-name/co/convmv/package.nix +++ b/pkgs/by-name/co/convmv/package.nix @@ -2,7 +2,9 @@ lib, stdenv, fetchzip, + makeWrapper, perl, + perlPackages, }: stdenv.mkDerivation (finalAttrs: { @@ -10,8 +12,9 @@ stdenv.mkDerivation (finalAttrs: { version = "2.06"; outputs = [ - "out" + "bin" "man" + "out" ]; src = fetchzip { @@ -21,12 +24,20 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ + makeWrapper + perl + ]; - buildInputs = [ perl ]; + buildInputs = [ + perl + perlPackages.EncodeHanExtra + perlPackages.EncodeIMAPUTF7 + perlPackages.EncodeJIS2K + ]; makeFlags = [ - "PREFIX=${placeholder "out"}" + "PREFIX=${placeholder "bin"}" "MANDIR=${placeholder "man"}/share/man" ]; @@ -46,6 +57,10 @@ stdenv.mkDerivation (finalAttrs: { dontPatchShebangs = true; + postFixup = '' + wrapProgram "$bin/bin/convmv" --prefix PERL5LIB : "$PERL5LIB" + ''; + meta = with lib; { description = "Converts filenames from one encoding to another"; downloadPage = "https://www.j3e.de/linux/convmv/"; diff --git a/pkgs/by-name/de/decent-sampler/package.nix b/pkgs/by-name/de/decent-sampler/package.nix index c388cef5aa75..5742b06a596c 100644 --- a/pkgs/by-name/de/decent-sampler/package.nix +++ b/pkgs/by-name/de/decent-sampler/package.nix @@ -14,7 +14,7 @@ let pname = "decent-sampler"; - version = "1.12.5"; + version = "1.12.14"; icon = fetchurl { url = "https://www.decentsamples.com/wp-content/uploads/2018/09/cropped-Favicon_512x512.png"; @@ -26,8 +26,8 @@ let src = fetchzip { # dropbox links: https://www.dropbox.com/sh/dwyry6xpy5uut07/AABBJ84bjTTSQWzXGG5TOQpfa\ - url = "https://www.dropbox.com/scl/fo/a0i0udw7ggfwnjoi05hh3/APOyrCpI3CaO46Gq1IFUv-A/Decent_Sampler-1.12.5-Linux-Static-x86_64.tar.gz?rlkey=orvjprslmwn0dkfs0ncx6nxnm&dl=0"; - hash = "sha256-jr2bl8nQhfWdpZZGQU6T6TDKSW6SZpweJ2GiQz7n9Ug="; + url = "https://www.dropbox.com/scl/fo/a0i0udw7ggfwnjoi05hh3/AFAQQGWSQ-kxJv5JggeMTrE/Decent_Sampler-1.12.14-Linux-Static-x86_64.tar.gz?rlkey=orvjprslmwn0dkfs0ncx6nxnm&dl=0"; + hash = "sha256-n9WTR11chK9oCz84uYhymov1axTVRr4OLo6W0cRpdWc="; }; nativeBuildInputs = [ copyDesktopItems ]; @@ -91,6 +91,7 @@ buildFHSEnv { # It claims to be free but we currently cannot find any license # that it is released under. license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ adam248 diff --git a/pkgs/by-name/de/devede/package.nix b/pkgs/by-name/de/devede/package.nix index d9342d690216..ff922648b855 100644 --- a/pkgs/by-name/de/devede/package.nix +++ b/pkgs/by-name/de/devede/package.nix @@ -12,6 +12,7 @@ wrapGAppsHook3, gdk-pixbuf, gobject-introspection, + nix-update-script, }: let @@ -25,14 +26,14 @@ let in buildPythonApplication rec { pname = "devede"; - version = "4.19.0"; + version = "4.21.0"; namePrefix = ""; src = fetchFromGitLab { owner = "rastersoft"; repo = "devedeng"; rev = version; - hash = "sha256-hjt2bXQov4lC6O4VY/eu/PZ2taSKng9gRhFDFhQR9SY="; + hash = "sha256-sLJkIKw0ciX6spugbdO0eZ1dIkoHfuu5e/f2XwA70a0="; }; nativeBuildInputs = [ @@ -66,10 +67,15 @@ buildPythonApplication rec { --replace "/usr/local/share" "$out/share" ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "DVD Creator for Linux"; homepage = "https://www.rastersoft.com/programas/devede.html"; license = licenses.gpl3; - maintainers = [ maintainers.bdimcheff ]; + maintainers = [ + maintainers.bdimcheff + maintainers.baksa + ]; }; } diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json index cc345d6abf3f..8f96bfec3d6f 100644 --- a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json @@ -493,10 +493,10 @@ "module": "sha256-rwV/vBEyR6Pp/cYOWU+dh2xPW8oZy4sb2myBGP9ixpU=", "pom": "sha256-EeldzI+ywwumAH/f9GxW+HF2/lwwLFGEQThZEk1Tq60=" }, - "io/sentry#sentry/8.11.1": { - "jar": "sha256-0EmSqkQXOQazcYAmpRyUMXDc663czsRTtszYAdGuZkg=", - "module": "sha256-x4i43VQ1Avv5hy7X11gvLfBPZwEzEoWb0fgun5sqgRM=", - "pom": "sha256-Fcd/SfMLh3uTBDq5O05T5KlFDlXxgWz+++/2fd47X2c=" + "io/sentry#sentry/8.12.0": { + "jar": "sha256-LkfktB4/El/cgKUS1fUaA5DRD9haWRHR+A5im7p3AAQ=", + "module": "sha256-LrKRmE4DJppwx0nCTSBwZHF9Rw8ex1lAD96birtXim4=", + "pom": "sha256-pwlifFbJHCooUNMFXPWWFTk+TCEMcMojMEpifX9SAlg=" }, "jakarta/json/bind#jakarta.json.bind-api/2.0.0": { "jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=", diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix index 0605d65747e1..f24b30fc7263 100644 --- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix @@ -16,13 +16,13 @@ }: stdenv.mkDerivation rec { pname = "ed-odyssey-materials-helper"; - version = "2.173"; + version = "2.178"; src = fetchFromGitHub { owner = "jixxed"; repo = "ed-odyssey-materials-helper"; tag = version; - hash = "sha256-PW5AnplciFenupASEqXA7NqQrH14Wfz1SSm1c/LWA7A="; + hash = "sha256-a/nrRw5FjUZBJE0CmSevGAw4LBI/A3jPAEJfg7GY5+U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix index a1d16594344b..acc5f57b012f 100644 --- a/pkgs/by-name/ga/gallery-dl/package.nix +++ b/pkgs/by-name/ga/gallery-dl/package.nix @@ -8,7 +8,7 @@ let pname = "gallery-dl"; - version = "1.29.6"; + version = "1.29.7"; in python3Packages.buildPythonApplication { inherit pname version; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication { owner = "mikf"; repo = "gallery-dl"; tag = "v${version}"; - hash = "sha256-D/HPAnIwCAfwzBrteGkZSMHFvXDPQLF4bHKDwppdkzc="; + hash = "sha256-OngtJ6E7Gvr+/5Vjv1vepPVVksNDRlXZkU9yMYRvh2k="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix index c1796663160b..4375315e49b7 100644 --- a/pkgs/by-name/ga/gat/package.nix +++ b/pkgs/by-name/ga/gat/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gat"; - version = "0.23.2"; + version = "0.24.0"; src = fetchFromGitHub { owner = "koki-develop"; repo = "gat"; tag = "v${version}"; - hash = "sha256-vJREExCJ+JvPYxNeJWQ6A4LRB2viEisnXrRM6yDGOc4="; + hash = "sha256-2AIRFG4YmEr1ZQ6JjhmRmOc5/BfTbeBd4azy1xQQr3Q="; }; - vendorHash = "sha256-yGTzDlu9l1Vfnt9Za4Axh7nFWe5CmW2kqssa+51bA3w="; + vendorHash = "sha256-9LHTyIL0+aJAUJsn3m1SUrZYM9JLo70JY0zb1oVFJFo="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix index bfe81443feaa..6de5e0960772 100644 --- a/pkgs/by-name/gi/gitlab-ci-local/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "gitlab-ci-local"; - version = "4.59.0"; + version = "4.60.1"; src = fetchFromGitHub { owner = "firecow"; repo = "gitlab-ci-local"; rev = version; - hash = "sha256-4C+96rPtEFDJc08D5qXEuNvoDWJR5drvsvZ6mCGd5Vo="; + hash = "sha256-6v5iyQCP+3bJdG9uvPAsMaJ7mW2xj1kMhn8h2eLsl28="; }; - npmDepsHash = "sha256-brzCPG/keYOGfjqnj8mP28OdSAKTbDQWBxN4oMLHoNU="; + npmDepsHash = "sha256-P09uxOtlY9AAJyKLTdnFOfw0H6V4trr2hznEonOO58E="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/go/gojo/package.nix b/pkgs/by-name/go/gojo/package.nix index c970aba7ff3f..b675dabd5378 100644 --- a/pkgs/by-name/go/gojo/package.nix +++ b/pkgs/by-name/go/gojo/package.nix @@ -6,14 +6,14 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gojo"; version = "0.3.2"; src = fetchFromGitHub { owner = "itchyny"; repo = "gojo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DMFTB5CgJTWf+P9ntgBgzdmcF2qjS9t3iUQ1Rer+Ab4="; }; @@ -23,6 +23,10 @@ buildGoModule rec { versionCheckHook ]; versionCheckProgramArg = "-v"; + postInstallCheck = '' + $out/bin/gojo --help > /dev/null + seq 1 10 | $out/bin/gojo -a | grep '^\[1,2,3,4,5,6,7,8,9,10\]$' > /dev/null + ''; doInstallCheck = true; passthru.updateScript = nix-update-script { }; @@ -30,9 +34,9 @@ buildGoModule rec { meta = { description = "Yet another Go implementation of jo"; homepage = "https://github.com/itchyny/gojo"; - changelog = "https://github.com/itchyny/gojo/releases/tag/v${version}"; + changelog = "https://github.com/itchyny/gojo/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ xiaoxiangmoe ]; mainProgram = "gojo"; }; -} +}) diff --git a/pkgs/by-name/ha/hamrs-pro/package.nix b/pkgs/by-name/ha/hamrs-pro/package.nix index e392175bc8de..ccdff2aefdb8 100644 --- a/pkgs/by-name/ha/hamrs-pro/package.nix +++ b/pkgs/by-name/ha/hamrs-pro/package.nix @@ -8,34 +8,36 @@ let pname = "hamrs-pro"; - version = "2.33.0"; + version = "2.37.1"; throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"; srcs = { x86_64-linux = fetchurl { url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-x86_64.AppImage"; - hash = "sha256-FUwyyuXtWaHauZyvRvrH7KDC0du02eNR5TfKJyiKb9k="; + hash = "sha256-kLYgqRH+RpyitUSZVoZFfqVsrJjTXeZp80ILHGQmGTk="; }; aarch64-linux = fetchurl { url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-arm64.AppImage"; - hash = "sha256-YQPKxjaNXE1AgEspZRLI1OUFU71rAU8NBcS0Jv94MS8="; + hash = "sha256-BKS7xPzVoIUToqEbtI+8t4Gf7HvZSWhzfXmToghFPEk="; }; x86_64-darwin = fetchurl { url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-x64.dmg"; - hash = "sha256-KtrXF47AwVAUXYk1Wu2aKMTXENv7q9JBb86Oy+UHQYY="; + hash = "sha256-gejyYoW7VcR0ILD/PSwFGC2tzLiiR2vjEsErBxbvJ3o="; }; aarch64-darwin = fetchurl { url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-arm64.dmg"; - hash = "sha256-H46z4V9lo+n/pZzna7KIiYxQBqTlZULitQrFEEMFDvo="; + hash = "sha256-Hi/t5ShfhUFw0aEzb2XIhOIppXg04qnq8tl3LKNH3qQ="; }; }; src = srcs.${stdenvNoCC.hostPlatform.system} or throwSystem; + passthru.updateScript = ./update.sh; + meta = { homepage = "https://hamrs.app/"; description = "Simple, portable logger tailored for activities like Parks on the Air, Field Day, and more"; @@ -58,6 +60,7 @@ let pname version src + passthru meta ; @@ -78,6 +81,7 @@ let pname version src + passthru meta ; diff --git a/pkgs/by-name/ha/hamrs-pro/update.sh b/pkgs/by-name/ha/hamrs-pro/update.sh new file mode 100755 index 000000000000..dfd93fa6788a --- /dev/null +++ b/pkgs/by-name/ha/hamrs-pro/update.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix-update common-updater-scripts nix + +set -euo pipefail + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; hamrs-pro.version or (lib.getVersion hamrs-pro)" | tr -d '"') +# extracting version from download link +latestVersion=$(curl -sL https://hamrs.app | grep -Po '(?<=hamrs-pro-)[0-9]+\.[0-9]+\.[0-9]+(?=-linux-x86_64\.AppImage)') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "package is up-to-date: $currentVersion" + exit 0 +fi + +update-source-version hamrs-pro $latestVersion || true + +for system in \ + x86_64-linux \ + aarch64-linux \ + x86_64-darwin \ + aarch64-darwin; do + hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; hamrs-pro.src.url" --system "$system" | tr -d '"'))) + update-source-version hamrs-pro $latestVersion $hash --system=$system --ignore-same-version +done diff --git a/pkgs/by-name/in/inshellisense/package.nix b/pkgs/by-name/in/inshellisense/package.nix index 88c7abc32697..b03751c40d40 100644 --- a/pkgs/by-name/in/inshellisense/package.nix +++ b/pkgs/by-name/in/inshellisense/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "inshellisense"; - version = "0.0.1-rc.20"; + version = "0.0.1-rc.21"; src = fetchFromGitHub { owner = "microsoft"; repo = "inshellisense"; tag = version; - hash = "sha256-UGF7tARMnRaeIEKUhYa63hBpEoMb6qV209ECPirkgyg="; + hash = "sha256-zERwrvioPwGm/351kYuK9S3uOrrzs/6OFPRdNSSr7Tc="; }; - npmDepsHash = "sha256-ycU0vEMgiKBaGKWMBPzQfIvBx6Q7jIHxgzZyi9VGBhw="; + npmDepsHash = "sha256-iD5SvkVbrHh0Hx44y6VtNerwBA8K7vSe/yfvhgndMEw="; # Needed for dependency `@homebridge/node-pty-prebuilt-multiarch` # On Darwin systems the build fails with, diff --git a/pkgs/by-name/ku/kubectl-klock/package.nix b/pkgs/by-name/ku/kubectl-klock/package.nix index aae2d47da28d..ba056902714d 100644 --- a/pkgs/by-name/ku/kubectl-klock/package.nix +++ b/pkgs/by-name/ku/kubectl-klock/package.nix @@ -7,18 +7,24 @@ buildGoModule rec { pname = "kubectl-klock"; - version = "0.7.2"; + version = "0.8.0"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "applejag"; - repo = pname; + repo = "kubectl-klock"; rev = "v${version}"; - hash = "sha256-S7cpVRVboLkU+GgvwozJmfFAO29tKpPlk+r9mbVLxF8="; + hash = "sha256-1t/DJ6cTikAl2edJFfDzXAB8OgdZSjk1C7vOGXyTu0U="; }; - vendorHash = "sha256-xz1I79FklKNpWdoQdzpXYAnKM+7FJcGn04lKH2E9A50="; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + vendorHash = "sha256-FWfAn3ZWScIXbdv3zwwZxFyMkpzJHZJuhxe22qvv1ac="; postInstall = '' makeWrapper $out/bin/kubectl-klock $out/bin/kubectl_complete-klock --add-flags __complete diff --git a/pkgs/by-name/le/leanify/package.nix b/pkgs/by-name/le/leanify/package.nix index e54f4bc74686..11193f2dbf53 100644 --- a/pkgs/by-name/le/leanify/package.nix +++ b/pkgs/by-name/le/leanify/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { pname = "leanify"; - version = "unstable-2023-12-17"; + version = "unstable-2025-05-15"; src = fetchFromGitHub { owner = "JayXon"; repo = "Leanify"; - rev = "9daa4303cdc03f6b90b72c369e6377c6beb75c39"; - hash = "sha256-fLazKCQnOT3bN3Kz25Q80RLk54EU5U6HCf6kPLcXn9c="; + rev = "42770e600b32962e7110c24b5fcaa8c7c2144b17"; + hash = "sha256-njfMR2DSKeVh+ZUewall7837E9JY3nhrTxO4LOY1pEo="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -29,7 +29,9 @@ stdenv.mkDerivation { checkPhase = '' runHook preCheck + ./leanify /dev/null + runHook postCheck ''; diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix index d371b4371d03..ff39c9c8fa65 100644 --- a/pkgs/by-name/li/libretro-shaders-slang/package.nix +++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "libretro-shaders-slang"; - version = "0-unstable-2025-05-17"; + version = "0-unstable-2025-05-20"; src = fetchFromGitHub { owner = "libretro"; repo = "slang-shaders"; - rev = "37aa1f355e19701b192ae0b88855094fe2f5ff22"; - hash = "sha256-30xMYR54z7aJqQZL8zqO93n12vYA7uE3GnZTHP92uRc="; + rev = "8c630e0d3234d93b6c2bc847371f86aa4e535686"; + hash = "sha256-BDxgVBWDUYgSvEl9dn/PB8c4ceYgM1Bo4aEzvqwTaYA="; }; dontConfigure = true; diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix index 0323e2b709d0..3fc5f2f5e39a 100644 --- a/pkgs/by-name/ll/lla/package.nix +++ b/pkgs/by-name/ll/lla/package.nix @@ -8,7 +8,7 @@ nix-update-script, }: let - version = "0.3.10"; + version = "0.3.11"; in rustPlatform.buildRustPackage { pname = "lla"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { owner = "chaqchase"; repo = "lla"; tag = "v${version}"; - hash = "sha256-/6p23JW3ZaSuDf34IWcTggR92/zUTMRerQ32bTsRujo="; + hash = "sha256-HxHUpFTAeK3/pE+ozHGmMUj0Jt7iKrbZ1xnFj7828Ng="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { ]; useFetchCargoVendor = true; - cargoHash = "sha256-aX8nm/V0ug2g40QeFU9AWxjuFAnW+gYTR8RC5CV7wRQ="; + cargoHash = "sha256-YvxzuOUowr5tcKZaZwgpeskfMJcOKJyHci43CfQWhOY="; cargoBuildFlags = [ "--workspace" ]; diff --git a/pkgs/by-name/ma/majima/package.nix b/pkgs/by-name/ma/majima/package.nix index 69b3d37a5e5a..67ef20d5c259 100644 --- a/pkgs/by-name/ma/majima/package.nix +++ b/pkgs/by-name/ma/majima/package.nix @@ -5,17 +5,17 @@ }: rustPlatform.buildRustPackage { pname = "majima"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromSourcehut { - owner = "~cucumber-zoom"; + owner = "~wq"; repo = "majima"; - rev = "0f32dceeaf09c082cf33ab31b40d3bfc45aaa6f8"; - hash = "sha256-P5E0Wiy3mNPRCQ/bsIW4fG7LnPSPRXmW7pnbgl0/lBQ="; + rev = "630427fcd158ccbaafe8bc3f7368fa8577b03548"; + hash = "sha256-znlJY/U7H+BvBM7n4IqE5x9ek1/QVxYkptsAnODz/Q0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bb3rg7vWRBSOPf0LM7avQQNlMjLiLFRtrGIfJbFWtHI="; + cargoHash = "sha256-I0txA41rmTZ3AHllRVsJzmZXbrm5+GSdd08EatxKCzk="; meta = { description = "Generate random usernames quickly and in various formats"; diff --git a/pkgs/by-name/ma/matrix-brandy/no-lrt.patch b/pkgs/by-name/ma/matrix-brandy/no-lrt.patch new file mode 100644 index 000000000000..7f42553852a9 --- /dev/null +++ b/pkgs/by-name/ma/matrix-brandy/no-lrt.patch @@ -0,0 +1,13 @@ +diff --git a/makefile b/makefile +index d89cee1..37c1ac5 100644 +--- a/makefile ++++ b/makefile +@@ -13,7 +13,7 @@ CFLAGS = -O3 -fPIE $(shell sdl-config --cflags) -DUSE_SDL -DDEFAULT_IGNORE -Wall + + LDFLAGS += + +-LIBS = -lm $(shell sdl-config --libs) -ldl -pthread -lrt -lX11 ++LIBS = -lm $(shell sdl-config --libs) -ldl -pthread -lX11 + + SRCDIR = src + diff --git a/pkgs/by-name/ma/matrix-brandy/package.nix b/pkgs/by-name/ma/matrix-brandy/package.nix index bf9d518783c3..2adc72a2e897 100644 --- a/pkgs/by-name/ma/matrix-brandy/package.nix +++ b/pkgs/by-name/ma/matrix-brandy/package.nix @@ -3,20 +3,28 @@ stdenv, fetchFromGitHub, libX11, + nix-update-script, SDL, }: stdenv.mkDerivation rec { pname = "matrix-brandy"; - version = "1.23.3"; + version = "1.23.5"; src = fetchFromGitHub { owner = "stardot"; repo = "MatrixBrandy"; rev = "V${version}"; - hash = "sha256-jw5SxCQ2flvCjO/JO3BHpnpt31wBsBxDkVH7uwVxTS0="; + hash = "sha256-sMgYgV4/vV1x5xSICXRpW6K8uCdVlJrS7iEg6XzQRo8="; }; + patches = lib.optionals stdenv.isDarwin [ ./no-lrt.patch ]; + + makeFlags = lib.optionals stdenv.isDarwin [ + "CC=cc" + "LD=clang" + ]; + buildInputs = [ libX11 SDL @@ -27,12 +35,14 @@ stdenv.mkDerivation rec { cp brandy $out/bin ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "http://brandy.matrixnetwork.co.uk/"; description = "Matrix Brandy BASIC VI for Linux, Windows, MacOSX"; mainProgram = "brandy"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ fiq ]; }; } diff --git a/pkgs/by-name/ma/mautrix-gmessages/package.nix b/pkgs/by-name/ma/mautrix-gmessages/package.nix index d96347f9ec1f..ddbd96cbabcb 100644 --- a/pkgs/by-name/ma/mautrix-gmessages/package.nix +++ b/pkgs/by-name/ma/mautrix-gmessages/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "mautrix-gmessages"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "mautrix"; repo = "gmessages"; tag = "v${version}"; - hash = "sha256-qpqFWQ4ZhgzG7SG6phW6LnS52Ve1S+Ky6YtjzfBkBmE="; + hash = "sha256-NzLHCVJaYl8q5meKZDy8St8J9c8oyASLLrXhWG7K+yw="; }; - vendorHash = "sha256-Ps9I8WtTtrc3gSMxt4XZ/IUipZL2+kbgNfbY2PYFoa8="; + vendorHash = "sha256-+aX0r7IvsjXwmz5d6X0yzhG28mBYKvyDGoCbKMwkvk8="; ldflags = [ "-s" diff --git a/pkgs/by-name/me/melos/package.nix b/pkgs/by-name/me/melos/package.nix index 4d9654af977c..a821d74fdb66 100644 --- a/pkgs/by-name/me/melos/package.nix +++ b/pkgs/by-name/me/melos/package.nix @@ -5,12 +5,12 @@ }: let pname = "melos"; - version = "6.2.0"; + version = "6.3.2"; src = fetchFromGitHub { owner = "invertase"; repo = "melos"; rev = "melos-v${version}"; - hash = "sha256-00K/LwrwjvO4LnXM2PDooQMJ6sXcJy9FBErtEwoMZlM="; + hash = "sha256-hD4UlQPFugRqtOZecyT/6wV3vFocoQ6OO5w+SZsYdO0="; }; in buildDartApplication { diff --git a/pkgs/by-name/me/melos/pubspec.lock.json b/pkgs/by-name/me/melos/pubspec.lock.json index 959553a3e607..3b04d9d91464 100644 --- a/pkgs/by-name/me/melos/pubspec.lock.json +++ b/pkgs/by-name/me/melos/pubspec.lock.json @@ -100,6 +100,16 @@ "source": "hosted", "version": "1.3.1" }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, "cli_launcher": { "dependency": "direct main", "description": { @@ -470,25 +480,15 @@ "source": "hosted", "version": "0.4.0" }, - "pubspec": { + "pubspec_parse": { "dependency": "direct main", "description": { - "name": "pubspec", - "sha256": "f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e", + "name": "pubspec_parse", + "sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.0" - }, - "quiver": { - "dependency": "transitive", - "description": { - "name": "quiver", - "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.1" + "version": "1.4.0" }, "shelf": { "dependency": "transitive", @@ -650,16 +650,6 @@ "source": "hosted", "version": "1.3.2" }, - "uri": { - "dependency": "transitive", - "description": { - "name": "uri", - "sha256": "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, "vm_service": { "dependency": "transitive", "description": { @@ -745,5 +735,3 @@ "dart": ">=3.3.0 <4.0.0" } } - - diff --git a/pkgs/by-name/me/meowlnir/package.nix b/pkgs/by-name/me/meowlnir/package.nix index 13c8d3d0c8ca..6c9fda7e91ba 100644 --- a/pkgs/by-name/me/meowlnir/package.nix +++ b/pkgs/by-name/me/meowlnir/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "meowlnir"; - version = "0.3.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "maunium"; repo = "meowlnir"; tag = "v${version}"; - hash = "sha256-ig803e4onU3E4Nj5aJo2+QfwZt12iKIJ7fS/BjXsojc="; + hash = "sha256-1YuSXKRiMUCRbxGIDOQKGKK7CxM3VD0LLEeULQJ/zRo="; }; buildInputs = [ olm ]; - vendorHash = "sha256-+P7tlpGTo9N+uSn22uAlzyB36hu3re+KfOe3a/uzLZE="; + vendorHash = "sha256-g0be4ftBRV6Ver1kULfhnVBAF+iL3+/4e25sozpJ7+s="; doCheck = true; doInstallCheck = true; diff --git a/pkgs/by-name/mo/mona-sans/package.nix b/pkgs/by-name/mo/mona-sans/package.nix index bc41d2d58f28..c7942b3ef057 100644 --- a/pkgs/by-name/mo/mona-sans/package.nix +++ b/pkgs/by-name/mo/mona-sans/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "mona-sans"; - version = "1.0.1"; + version = "2.0"; src = fetchFromGitHub { rev = "v${finalAttrs.version}"; owner = "github"; repo = "mona-sans"; - sha256 = "sha256-XvqLFzlgIqx9aZH2SEAtwMiuWgUiDi/gHGSpfreUHuk="; + sha256 = "sha256-pFc6EUzf4FlA0LVdDEnFNr7m5V1FLc4jTAvtZdOslTg="; }; installPhase = '' diff --git a/pkgs/by-name/nn/nnd/package.nix b/pkgs/by-name/nn/nnd/package.nix new file mode 100644 index 000000000000..d0cb7818c71c --- /dev/null +++ b/pkgs/by-name/nn/nnd/package.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + pkgsCross, +}: +let + inherit (pkgsCross.musl64) rustPlatform; +in +rustPlatform.buildRustPackage (finalAttrs: { + pname = "nnd"; + version = "0.19"; + + src = fetchFromGitHub { + owner = "al13n321"; + repo = "nnd"; + tag = "v${finalAttrs.version}"; + hash = "sha256-DjJDNsyOrDLaMruGLP3arfrCs/7hW24wfjvPncndY+Q="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-Iwipxy0xKDyFLMmdB2FQve6DULX+46Pi9rOaK0bDTB0="; + + meta = { + description = "Debugger for Linux"; + homepage = "https://github.com/al13n321/nnd/tree/main"; + license = lib.licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ sinjin2300 ]; + mainProgram = "nnd"; + }; +}) diff --git a/pkgs/by-name/ow/owncast/package.nix b/pkgs/by-name/ow/owncast/package.nix index 66a2c11e9210..c1b8e0fbbd27 100644 --- a/pkgs/by-name/ow/owncast/package.nix +++ b/pkgs/by-name/ow/owncast/package.nix @@ -5,12 +5,11 @@ nixosTests, bash, which, - ffmpeg, + ffmpeg-full, makeBinaryWrapper, }: - let - version = "0.2.0"; + version = "0.2.3"; in buildGoModule { pname = "owncast"; @@ -19,21 +18,27 @@ buildGoModule { owner = "owncast"; repo = "owncast"; rev = "v${version}"; - hash = "sha256-MdquhDdbOdP1shnKHBlzQrSDe41fp0qnMzgaqL89jTk="; + hash = "sha256-JCIB4G3cOSkEEO/jcsj4mUP+HeQfgn0jX4OL8NX9/C0="; }; - vendorHash = "sha256-ERilQZ8vnhGW1IEcLA4CcmozDooHKbnmASMw87tjYD4="; + vendorHash = "sha256-FuynEBoPS0p1bRgmaeCxn1RPqbYHcltZpQ9SE71xHEE="; - propagatedBuildInputs = [ ffmpeg ]; + propagatedBuildInputs = [ ffmpeg-full ]; nativeBuildInputs = [ makeBinaryWrapper ]; + # lefthook is included as a tool in go.mod for a pre-commit hook, but causes the build to fail + preBuild = '' + # Remove lefthook from tools section in go.mod + sed -i '/tool (/,/)/{ /[[:space:]]*github.com\/evilmartians\/lefthook[[:space:]]*$/d; }' go.mod + ''; + postInstall = '' wrapProgram $out/bin/owncast \ --prefix PATH : ${ lib.makeBinPath [ bash which - ffmpeg + ffmpeg-full ] } ''; @@ -51,8 +56,10 @@ buildGoModule { homepage = "https://owncast.online"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ MayNiklas ]; + maintainers = with maintainers; [ + flexiondotorg + MayNiklas + ]; mainProgram = "owncast"; }; - } diff --git a/pkgs/by-name/pd/pdftitle/package.nix b/pkgs/by-name/pd/pdftitle/package.nix index a8a134e3b645..7ddc73feb785 100644 --- a/pkgs/by-name/pd/pdftitle/package.nix +++ b/pkgs/by-name/pd/pdftitle/package.nix @@ -2,24 +2,33 @@ lib, fetchFromGitHub, python3Packages, + openai, pdfminer, + + withOpenai ? false, }: python3Packages.buildPythonApplication rec { pname = "pdftitle"; - version = "0.18"; + version = "0.20"; pyproject = true; src = fetchFromGitHub { owner = "metebalci"; repo = "pdftitle"; tag = "v${version}"; - hash = "sha256-rGGO4Cy+DZRU3ywb6Jq55JiM8ALgs/9wQmeXcSbPpG0="; + hash = "sha256-05SaAXYJ7l0ZldYufj0x9mYRwwGT7vlmq9a+ZF4pYiA="; }; build-system = with python3Packages; [ setuptools ]; - dependencies = with python3Packages; [ pdfminer ]; + dependencies = + with python3Packages; + [ + pdfminer + python-dotenv + ] + ++ lib.optional withOpenai openai; pythonImportsCheck = [ "pdftitle" ]; diff --git a/pkgs/by-name/pi/pixelflasher/package.nix b/pkgs/by-name/pi/pixelflasher/package.nix index 5b20e7213998..71d9e9c4dc6b 100644 --- a/pkgs/by-name/pi/pixelflasher/package.nix +++ b/pkgs/by-name/pi/pixelflasher/package.nix @@ -10,14 +10,14 @@ }: python3Packages.buildPythonApplication rec { pname = "pixelflasher"; - version = "7.11.4.0"; + version = "8.0.1.0"; format = "other"; src = fetchFromGitHub { owner = "badabing2005"; repo = "PixelFlasher"; tag = "v${version}"; - hash = "sha256-TFvMxYGiRNpuwQyDmSqnksQ31azucZzXq9mZHvl/C4U="; + hash = "sha256-3cIrQ5MbYfWpxFZBJTg0h/Q8PHsWP4KYZvGUnhMEjK4="; }; desktopItems = [ @@ -43,6 +43,7 @@ python3Packages.buildPythonApplication rec { lz4 markdown platformdirs + polib protobuf4 psutil pyperclip diff --git a/pkgs/by-name/pm/pm2/package.nix b/pkgs/by-name/pm/pm2/package.nix index 6884ea8d91eb..731c0c8b0561 100644 --- a/pkgs/by-name/pm/pm2/package.nix +++ b/pkgs/by-name/pm/pm2/package.nix @@ -2,20 +2,26 @@ lib, buildNpmPackage, fetchFromGitHub, + npm-lockfile-fix, }: buildNpmPackage rec { pname = "pm2"; - version = "5.4.2"; + version = "6.0.6"; src = fetchFromGitHub { owner = "Unitech"; repo = "pm2"; rev = "v${version}"; - hash = "sha256-8Fsh7rld7rtT55qVgj3/XbujNpZx0BfzTRcLjdPLFSA="; + hash = "sha256-ji6IOlPSEj+qpSusF3OX056KuZDL3JjvaTNT/UQTiqA="; + + # Requested patch upstream: https://github.com/Unitech/pm2/pull/5985 + postFetch = '' + ${lib.getExe npm-lockfile-fix} $out/package-lock.json + ''; }; - npmDepsHash = "sha256-Rp3euhURkZgVyszyAwrIftL7lY4aoP+Q4kSQBFxwTcs="; + npmDepsHash = "sha256-b+SSal4eNruQOMNAFoLLJdzfFhz1T3EieDv4kTwwA1Y="; dontNpmBuild = true; diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix index bffd37a9b187..ea38a71b109b 100644 --- a/pkgs/by-name/pr/protoc-gen-es/package.nix +++ b/pkgs/by-name/pr/protoc-gen-es/package.nix @@ -7,20 +7,20 @@ buildNpmPackage rec { pname = "protoc-gen-es"; - version = "2.2.5"; + version = "2.5.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protobuf-es"; tag = "v${version}"; - hash = "sha256-7g7DZSSFyidgpWJQNuKQRpyDuCDQT6gGgIKNk1JsbEk="; + hash = "sha256-wllLeX7veCbpb/mTAIs0cf/hcVItEmw2HW/UR4k0Epc="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-NclrKsBBHlcYIgWf0bEq7xI3pUq2RvZ+0Ebj77ICars="; + npmDepsHash = "sha256-PGieFyPgb2ERTdQc3HH5mg/uh5xj7nkUa0qwmgxofVY="; npmWorkspace = "packages/protoc-gen-es"; diff --git a/pkgs/by-name/pr/prowlarr/package.nix b/pkgs/by-name/pr/prowlarr/package.nix index 85180da593bf..2368d0d7eea7 100644 --- a/pkgs/by-name/pr/prowlarr/package.nix +++ b/pkgs/by-name/pr/prowlarr/package.nix @@ -37,16 +37,16 @@ let hash = { - aarch64-darwin = "sha256-zHaYgR9UXKnyikt5z3UUmh6oTNoNv5mqtnAId9kCzgE="; - aarch64-linux = "sha256-xChYbzs4zTWe71xwn3TfUZHGTOHHjzDwbkzPgQEfQZk="; - x86_64-darwin = "sha256-mual72UuFh9h7Hc/hHqSUeFInwm09f+UptX8jqknXlg="; - x86_64-linux = "sha256-UCiHeg46ncRQA6rDW4uxoFRqC7cuwMdr33OrN7yj51o="; + aarch64-darwin = "sha256-IkFkQoEPVaV+eVp2DkZECXTkzJyyNYTUBsCBdXCBZC8="; + aarch64-linux = "sha256-uwg5Ec9MC6jLwNdauF1tj2gSkhWdyhvWnUTLt8P1OZw="; + x86_64-darwin = "sha256-mdDZvKyhKXnHEKvZRH8Di6dZP80AEktnkMOnIZW+Gik="; + x86_64-linux = "sha256-N0KDb6MsGAJKSh5GSm7aiamjflHRXb06fL1KM2T1+bg="; } .${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.35.1.5034"; + version = "1.36.3.5071"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/by-name/re/rebels-in-the-sky/package.nix b/pkgs/by-name/re/rebels-in-the-sky/package.nix index 7f6cbe16c746..7a8cf044293f 100644 --- a/pkgs/by-name/re/rebels-in-the-sky/package.nix +++ b/pkgs/by-name/re/rebels-in-the-sky/package.nix @@ -3,7 +3,6 @@ lib, fetchFromGitHub, rustPlatform, - fetchpatch, cmake, pkg-config, alsa-lib, @@ -15,28 +14,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rebels-in-the-sky"; - version = "1.0.29"; + version = "1.0.30"; src = fetchFromGitHub { owner = "ricott1"; repo = "rebels-in-the-sky"; tag = "v${finalAttrs.version}"; - hash = "sha256-rWBaD4nxSmr1RZRbc51Sz9Xl2Te2yv4HNuFqWj8KayM="; + hash = "sha256-eC8n9g2kFErTRWWNo6jwAMGBX3+xGjtzq23+r3w0n0I="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ZRxq6/mgXZ33o1AEHnSOt4HJAI1y+F+ysVNvvbb9M28="; + cargoHash = "sha256-dGD0RpelENEWe9W/3CXUS2GhOXRaWhCoD8AI2n4mUfs="; - patches = - lib.optionals (!withRadio) [ - ./disable-radio.patch - ] - ++ [ - # https://github.com/ricott1/rebels-in-the-sky/pull/25 - (fetchpatch { - url = "https://github.com/ricott1/rebels-in-the-sky/commit/31778fee783637fe8af09f71754f35c5d15b800a.patch"; - hash = "sha256-PO/aY+fB72gQpxE5eaIP/s4xevfQ/Ac1TH5ZEKwpw1I="; - }) - ]; + patches = lib.optionals (!withRadio) [ + ./disable-radio.patch + ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/rescrobbled/package.nix b/pkgs/by-name/re/rescrobbled/package.nix index 59914fbb785c..eef97daf1511 100644 --- a/pkgs/by-name/re/rescrobbled/package.nix +++ b/pkgs/by-name/re/rescrobbled/package.nix @@ -1,6 +1,6 @@ { lib, - bash, + dash, fetchFromGitHub, rustPlatform, pkg-config, @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "rescrobbled"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "InputUsername"; repo = "rescrobbled"; rev = "v${version}"; - hash = "sha256-1E+SeKjHCah+IFn2QLAyyv7jgEcZ1gtkh8iHgiVBuz4="; + hash = "sha256-HWv0r0eqzY4q+Q604ZIkdhnjmCGX+L6HHXa6iCtH2KE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-oXj3pMT7lBcj/cNa6FY8ehr9TVSRUwqW3B4g5VeyH2w="; + cargoHash = "sha256-zZqDbXIXuNX914EmeSv3hZFnpjYzYdYZk7av3W60YuM="; nativeBuildInputs = [ pkg-config ]; @@ -32,11 +32,11 @@ rustPlatform.buildRustPackage rec { postPatch = '' # Required for tests - substituteInPlace src/filter.rs --replace '#!/usr/bin/bash' '#!${bash}/bin/bash' + substituteInPlace src/filter.rs --replace-fail '#!/usr/bin/env sh' '#!${dash}/bin/dash' ''; postInstall = '' - substituteInPlace rescrobbled.service --replace '%h/.cargo/bin/rescrobbled' "$out/bin/rescrobbled" + substituteInPlace rescrobbled.service --replace-fail '%h/.cargo/bin/rescrobbled' "$out/bin/rescrobbled" install -Dm644 rescrobbled.service -t "$out/share/systemd/user" ''; diff --git a/pkgs/by-name/s3/s3proxy/package.nix b/pkgs/by-name/s3/s3proxy/package.nix index b2281b7f2ad9..011db530cd00 100644 --- a/pkgs/by-name/s3/s3proxy/package.nix +++ b/pkgs/by-name/s3/s3proxy/package.nix @@ -9,17 +9,17 @@ let pname = "s3proxy"; - version = "2.1.0"; + version = "2.6.0"; in maven.buildMavenPackage { inherit pname version; - mvnHash = "sha256-85mE/pZ0DXkzOKvTAqBXGatAt8gc4VPRCxmEyIlyVGI="; + mvnHash = "sha256-OCFs1Q4NL5heP8AVvkQ+ZdhmPD2SNZMCF2gxjXpbfW4="; src = fetchFromGitHub { owner = "gaul"; repo = pname; rev = "s3proxy-${version}"; - hash = "sha256-GhZPvo8wlXInHwg8rSmpwMMkZVw5SMpnZyKqFUYLbrE="; + hash = "sha256-wd3GdSAcoJvlyFqnccdhM83IY2Q7KJQHoyV+sQGEwo4="; }; doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index 9351d0c02835..50183972f8fe 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-2nDTARUH5gb/pP4WnCfSPzreAThMAuAuwRT7y2aumBA="; + hash = "sha256-ZfC0k1Z7nOeauHYTKjMt73qhoTn4c15dZWvICeuYhM8="; }; # Fix build on darwin diff --git a/pkgs/by-name/sm/smlfut/package.nix b/pkgs/by-name/sm/smlfut/package.nix index 21938595b301..323f3ca6c3f3 100644 --- a/pkgs/by-name/sm/smlfut/package.nix +++ b/pkgs/by-name/sm/smlfut/package.nix @@ -7,15 +7,15 @@ futhark, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "smlfut"; - version = "1.6.2"; + version = "1.6.4"; src = fetchFromGitHub { owner = "diku-dk"; repo = "smlfut"; - rev = "v${version}"; - hash = "sha256-0Bqgoyp43Y961BMghJFBUx+1lcM2HHlPDjPyLHquWiE="; + rev = "v${finalAttrs.version}"; + hash = "sha256-xICcobdvSdHZfNxz4WRDOsaL4JGFRK7LmhMzKOZY5FY="; }; enableParallelBuilding = true; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ athas ]; mainProgram = "smlfut"; }; -} +}) diff --git a/pkgs/by-name/so/soundfont-generaluser/package.nix b/pkgs/by-name/so/soundfont-generaluser/package.nix index df1a24af9589..72be24893163 100644 --- a/pkgs/by-name/so/soundfont-generaluser/package.nix +++ b/pkgs/by-name/so/soundfont-generaluser/package.nix @@ -1,29 +1,31 @@ { lib, stdenv, - fetchzip, + fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "generaluser"; - version = "1.471"; + version = "2.0.2-unstable-2025-04-21"; - # we can't use fetchurl since stdenv does not handle unpacking *.zip's by default. - src = fetchzip { - # Linked on https://www.schristiancollins.com/generaluser.php: - url = "https://www.dropbox.com/s/4x27l49kxcwamp5/GeneralUser_GS_${version}.zip"; - sha256 = "sha256-lwUlWubXiVZ8fijKuNF54YQjT0uigjNAbjKaNjmC51s="; + src = fetchFromGitHub { + owner = "mrbumpy409"; + repo = "GeneralUser-GS"; + rev = "74d4cfe4042a61ddab17d4f86dbccd9d2570eb2a"; + hash = "sha256-I27l8F/BFAo6YSNbtAV14AKVsPIJTHFG2eGudseWmjo="; }; installPhase = '' - install -Dm644 GeneralUser*.sf2 $out/share/soundfonts/GeneralUser-GS.sf2 + runHook preInstall + install -Dm644 $src/GeneralUser-GS.sf2 $out/share/soundfonts/GeneralUser-GS.sf2 + runHook postInstall ''; - meta = with lib; { - description = "SoundFont bank featuring 259 instrument presets and 11 drum kits"; + meta = { + description = "General MIDI SoundFont with a low memory footprint"; homepage = "https://www.schristiancollins.com/generaluser.php"; - license = licenses.generaluser; - platforms = platforms.all; - maintainers = [ ]; + license = lib.licenses.generaluser; + maintainers = with lib.maintainers; [ keenanweaver ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/su/sublime_syntax_convertor/Gemfile.lock b/pkgs/by-name/su/sublime_syntax_convertor/Gemfile.lock index 82c833feb066..1f079d3c6c56 100644 --- a/pkgs/by-name/su/sublime_syntax_convertor/Gemfile.lock +++ b/pkgs/by-name/su/sublime_syntax_convertor/Gemfile.lock @@ -4,16 +4,15 @@ GEM GEM remote: https://rubygems.org/ specs: - plist (3.7.1) + plist (3.7.2) sublime_syntax_convertor (0.1.0) plist PLATFORMS ruby - x86_64-linux DEPENDENCIES sublime_syntax_convertor! BUNDLED WITH - 2.5.5 + 2.6.6 diff --git a/pkgs/by-name/su/sublime_syntax_convertor/gemset.nix b/pkgs/by-name/su/sublime_syntax_convertor/gemset.nix index 246a8f8e5297..86122b31f069 100644 --- a/pkgs/by-name/su/sublime_syntax_convertor/gemset.nix +++ b/pkgs/by-name/su/sublime_syntax_convertor/gemset.nix @@ -4,10 +4,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0b643i5b7b7galvlb2fc414ifmb78b5lsq47gnvhzl8m27dl559z"; + sha256 = "0hlaf4b3d8grxm9fqbnam5gwd55wvghl0jyzjd1hc5hirhklaynk"; type = "gem"; }; - version = "3.7.1"; + version = "3.7.2"; }; sublime_syntax_convertor = { dependencies = [ "plist" ]; diff --git a/pkgs/by-name/su/sublime_syntax_convertor/package.nix b/pkgs/by-name/su/sublime_syntax_convertor/package.nix index 869498bfb4ed..2a654168bccb 100644 --- a/pkgs/by-name/su/sublime_syntax_convertor/package.nix +++ b/pkgs/by-name/su/sublime_syntax_convertor/package.nix @@ -1,9 +1,16 @@ -{ lib, bundlerApp }: -bundlerApp { +{ + lib, + bundlerApp, + bundlerUpdateScript, +}: + +bundlerApp rec { pname = "sublime_syntax_convertor"; gemdir = ./.; exes = [ "sublime_syntax_convertor" ]; + passthru.updateScript = bundlerUpdateScript pname; + meta = { description = "Converts tmLanguage to sublime-syntax"; homepage = "https://github.com/aziz/SublimeSyntaxConvertor/"; diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix index 86f0059cca56..313d6bbdd3c2 100644 --- a/pkgs/by-name/sv/svdtools/package.nix +++ b/pkgs/by-name/sv/svdtools/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.4.6"; + version = "0.5.0"; src = fetchCrate { inherit version pname; - hash = "sha256-AfRFtybGEpArLGKp4AkGlokfNFMK8Ez5VA5Fu5GUhRI="; + hash = "sha256-2GemBVTRvYC5bvlYgJKmDJM78ZoE63B1QwV8cfSHYPg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-0GR9pbrevb0USu8de1oFHePJH1hGTvcVh3Gc9WKP0uA="; + cargoHash = "sha256-sn+Z3/p4Ek/wxwTj6uwDBFP1hFNGDb2EZ7MO0zvPjPk="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/pkgs/by-name/va/vault-tasks/package.nix b/pkgs/by-name/va/vault-tasks/package.nix index 423adab5fe02..711c88a01459 100644 --- a/pkgs/by-name/va/vault-tasks/package.nix +++ b/pkgs/by-name/va/vault-tasks/package.nix @@ -5,7 +5,7 @@ nix-update-script, }: let - version = "0.11.0"; + version = "0.11.1"; in rustPlatform.buildRustPackage { pname = "vault-tasks"; @@ -14,10 +14,10 @@ rustPlatform.buildRustPackage { owner = "louis-thevenet"; repo = "vault-tasks"; rev = "v${version}"; - hash = "sha256-3hRn3x86XLVMBtDlMsuqeEWgsgSeapri9MYNLqDxGF4="; + hash = "sha256-7stFa2fLczGyoM/O2S/uKCfjSDyABUw/b3tXp7Olqq8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mh6LUb1gS/cICyVWCYvmCSeqxaIWI6PyLeQx13dZ0CA="; + cargoHash = "sha256-RSW0N0icKAZbh8KQNkI9TgcKwa6hTKjhaJWCGADtfq8="; postInstall = "install -Dm444 desktop/vault-tasks.desktop -t $out/share/applications"; diff --git a/pkgs/by-name/va/vaultwarden/package.nix b/pkgs/by-name/va/vaultwarden/package.nix index 0eba9e6e26c6..077791d40554 100644 --- a/pkgs/by-name/va/vaultwarden/package.nix +++ b/pkgs/by-name/va/vaultwarden/package.nix @@ -19,17 +19,17 @@ in rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.33.2"; + version = "1.34.1"; src = fetchFromGitHub { owner = "dani-garcia"; repo = "vaultwarden"; rev = version; - hash = "sha256-Lu3/qVTi5Eedcm+3XlHAAJ1nPHm9hW4HZncQKmzDdoo="; + hash = "sha256-SVEQX+uAYb4/qFQZRm2khOi8ti76v3F5lRnUgoHk8wA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-T/ehLSPJmEuQYhotK12iqXQSe5Ke8+dkr9PVDe4Kmis="; + cargoHash = "sha256-Or259iQP89Ptf/XHpkHD08VDyCk/nQcFlyoKRUUQKt0="; # used for "Server Installed" version in admin panel env.VW_VERSION = version; diff --git a/pkgs/by-name/va/vaultwarden/webvault.nix b/pkgs/by-name/va/vaultwarden/webvault.nix index 9779d63b25b8..5e306c9860b0 100644 --- a/pkgs/by-name/va/vaultwarden/webvault.nix +++ b/pkgs/by-name/va/vaultwarden/webvault.nix @@ -2,43 +2,23 @@ lib, buildNpmPackage, fetchFromGitHub, - git, nixosTests, python3, vaultwarden, }: -let - version = "2025.1.1"; - - suffix = lib.head (lib.match "[0-9.]*([a-z]*)" version); - - bw_web_builds = fetchFromGitHub { - owner = "dani-garcia"; - repo = "bw_web_builds"; - rev = "v${version}"; - hash = "sha256-wQGpl7N0D83FrrV4T+LFe9h3n5Q/MqLbGGO2F5R9k2g="; - }; - -in buildNpmPackage rec { pname = "vaultwarden-webvault"; - inherit version; + version = "2025.5.0.0"; src = fetchFromGitHub { - owner = "bitwarden"; - repo = "clients"; - rev = "web-v${lib.removeSuffix suffix version}"; - hash = "sha256-Bq133V8CsDMnLeaKrW5JmLTGRaZVLRbp+tTgG725tqE="; + owner = "vaultwarden"; + repo = "vw_web_builds"; + tag = "v${version}"; + hash = "sha256-Z3QPKeo7+QV3XnECvLXz2Upv41h579WoVH0Vev0fixk="; }; - npmDepsHash = "sha256-bWcp3VJI2bObLH/XBx3cdxXQY9Cw+IFpeNA2TXVTtFg="; - - postPatch = '' - ln -s ${bw_web_builds}/{patches,resources} .. - PATH="${git}/bin:$PATH" VAULT_VERSION="${lib.removePrefix "web-" src.rev}" \ - bash ${bw_web_builds}/scripts/apply_patches.sh - ''; + npmDepsHash = "sha256-FC3x7H0MQDVGajtaMA2PUK5+soG6kD9AaDbq/s1pOnY="; nativeBuildInputs = [ python3 @@ -73,7 +53,6 @@ buildNpmPackage rec { ''; passthru = { - inherit bw_web_builds; tests = nixosTests.vaultwarden; }; diff --git a/pkgs/by-name/wa/waypaper/package.nix b/pkgs/by-name/wa/waypaper/package.nix index 8d3b0018582f..bca1f3039aa0 100644 --- a/pkgs/by-name/wa/waypaper/package.nix +++ b/pkgs/by-name/wa/waypaper/package.nix @@ -1,22 +1,22 @@ { lib, - python3, + python3Packages, fetchFromGitHub, gobject-introspection, wrapGAppsHook3, killall, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "waypaper"; - version = "2.5"; + version = "2.6"; pyproject = true; src = fetchFromGitHub { owner = "anufrievroman"; repo = "waypaper"; tag = version; - hash = "sha256-g1heJUBVJzRZXcNQCwRcqp6cTUaroKVpcTjG0KldlxU="; + hash = "sha256-MGfTuQcVChI4g7RONiTZZ4a5uX5SDjfLeMxbLIZ7VH4="; }; nativeBuildInputs = [ @@ -24,15 +24,15 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook3 ]; - build-system = [ python3.pkgs.setuptools ]; + build-system = with python3Packages; [ setuptools ]; - dependencies = [ - python3.pkgs.pygobject3 - python3.pkgs.platformdirs - python3.pkgs.pillow - python3.pkgs.imageio - python3.pkgs.imageio-ffmpeg - python3.pkgs.screeninfo + dependencies = with python3Packages; [ + imageio + imageio-ffmpeg + pillow + platformdirs + pygobject3 + screeninfo ]; propagatedBuildInputs = [ killall ]; @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - meta = with lib; { + meta = { changelog = "https://github.com/anufrievroman/waypaper/releases/tag/${version}"; description = "GUI wallpaper setter for Wayland-based window managers"; mainProgram = "waypaper"; @@ -56,8 +56,11 @@ python3.pkgs.buildPythonApplication rec { If wallpaper does not change, make sure that swaybg or swww is installed. ''; homepage = "https://github.com/anufrievroman/waypaper"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ totalchaos ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + prince213 + totalchaos + ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/xr/xrdp/package.nix b/pkgs/by-name/xr/xrdp/package.nix index 69e8592aa7dd..b48f43dbb2b7 100644 --- a/pkgs/by-name/xr/xrdp/package.nix +++ b/pkgs/by-name/xr/xrdp/package.nix @@ -12,7 +12,7 @@ openssl, systemd, pam, - fuse, + fuse3, libdrm, libjpeg, libopus, @@ -29,13 +29,13 @@ let xorgxrdp = stdenv.mkDerivation rec { pname = "xorgxrdp"; - version = "0.10.2"; + version = "0.10.4"; src = fetchFromGitHub { owner = "neutrinolabs"; repo = "xorgxrdp"; rev = "v${version}"; - hash = "sha256-xwkGY9dD747kyTvoXrYAIoiFBzQe5ngskUYQhDawnbU="; + hash = "sha256-TuzUerfOn8+3YfueG00IBP9sMpvy2deyL16mWQ8cRHg="; }; nativeBuildInputs = [ @@ -74,7 +74,7 @@ let xrdp = stdenv.mkDerivation rec { pname = "xrdp"; - version = "0.10.1"; + version = "0.10.3"; src = applyPatches { inherit version; @@ -85,7 +85,7 @@ let repo = "xrdp"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-lqifQJ/JX+0304arVctsEBEDFPhEPn2OWLyjAQW1who="; + hash = "sha256-6QSz0a0ed1UxfYYibehPgGUzU/xf1HmqEvVE4xU5hRg="; }; }; @@ -100,7 +100,7 @@ let ]; buildInputs = [ - fuse + fuse3 lame libjpeg libjpeg_turbo diff --git a/pkgs/tools/security/zsteg/Gemfile b/pkgs/by-name/zs/zsteg/Gemfile similarity index 100% rename from pkgs/tools/security/zsteg/Gemfile rename to pkgs/by-name/zs/zsteg/Gemfile diff --git a/pkgs/tools/security/zsteg/Gemfile.lock b/pkgs/by-name/zs/zsteg/Gemfile.lock similarity index 80% rename from pkgs/tools/security/zsteg/Gemfile.lock rename to pkgs/by-name/zs/zsteg/Gemfile.lock index 0cd593f60a0f..ef7578657924 100644 --- a/pkgs/tools/security/zsteg/Gemfile.lock +++ b/pkgs/by-name/zs/zsteg/Gemfile.lock @@ -2,12 +2,12 @@ GEM remote: https://rubygems.org/ specs: forwardable (1.3.3) - iostruct (0.0.5) - prime (0.1.2) + iostruct (0.5.0) + prime (0.1.3) forwardable singleton rainbow (3.1.1) - singleton (0.2.0) + singleton (0.3.0) zpng (0.4.5) rainbow (~> 3.1.1) zsteg (0.2.13) @@ -22,4 +22,4 @@ DEPENDENCIES zsteg BUNDLED WITH - 2.4.13 + 2.6.6 diff --git a/pkgs/tools/security/zsteg/gemset.nix b/pkgs/by-name/zs/zsteg/gemset.nix similarity index 85% rename from pkgs/tools/security/zsteg/gemset.nix rename to pkgs/by-name/zs/zsteg/gemset.nix index 07dfcf016f01..37fa75cb8113 100644 --- a/pkgs/tools/security/zsteg/gemset.nix +++ b/pkgs/by-name/zs/zsteg/gemset.nix @@ -14,10 +14,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1z3vnb8mhzns3ybf78vlj5cy6lq4pyfm8n40kqba2s33xccs3kl0"; + sha256 = "0pswyhjz9d90bympsz6s0rgv24b8nrd4lk5y16kz67vdw6vbaqbp"; type = "gem"; }; - version = "0.0.5"; + version = "0.5.0"; }; prime = { dependencies = [ @@ -28,10 +28,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1973kz8lbck6ga5v42f55jk8b8pnbgwp9p67dl1xw15gvz55dsfl"; + sha256 = "1qsk9q2n4yb80f5mwslxzfzm2ckar25grghk95cj7sbc1p2k3w5s"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; rainbow = { groups = [ "default" ]; @@ -48,10 +48,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qq54imvbksnckzf9hrq9bjzcdb0n8wfv6l5jc0di10n88277jx6"; + sha256 = "0y2pc7lr979pab5n5lvk3jhsi99fhskl5f2s6004v8sabz51psl3"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.0"; }; zpng = { dependencies = [ "rainbow" ]; diff --git a/pkgs/tools/security/zsteg/default.nix b/pkgs/by-name/zs/zsteg/package.nix similarity index 72% rename from pkgs/tools/security/zsteg/default.nix rename to pkgs/by-name/zs/zsteg/package.nix index c078189f4f29..d2f58193729a 100644 --- a/pkgs/tools/security/zsteg/default.nix +++ b/pkgs/by-name/zs/zsteg/package.nix @@ -1,12 +1,18 @@ -{ lib, bundlerApp }: +{ + lib, + bundlerApp, + bundlerUpdateScript, +}: -bundlerApp { +bundlerApp rec { pname = "zsteg"; gemdir = ./.; exes = [ "zsteg" ]; + passthru.updateScript = bundlerUpdateScript pname; + meta = with lib; { description = "Detect stegano-hidden data in PNG & BMP"; homepage = "http://zed.0xff.me/"; diff --git a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix index 6c3b7febf80b..858924b5d140 100644 --- a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix +++ b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dde-tray-loader"; - version = "1.0.7"; + version = "1.0.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "dde-tray-loader"; rev = finalAttrs.version; - hash = "sha256-LzRjOl3kHArpxwerh7XOisYIJ+t+r/zWUbvYh6k6zKw="; + hash = "sha256-3rmLQRGtBLASr0VSsIfGP0R9HDxFlea+iNbVjkqKTVg="; }; patches = [ diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 598c42a48d3e..ee1adfd43e0c 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -67,6 +67,10 @@ in [ (if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch) ] ++ ( { + "15" = [ + ./13/no-sys-dirs-riscv.patch + ./13/mangle-NIX_STORE-in-__FILE__.patch + ]; "14" = [ ./13/no-sys-dirs-riscv.patch ./13/mangle-NIX_STORE-in-__FILE__.patch diff --git a/pkgs/development/ocaml-modules/lwt_eio/default.nix b/pkgs/development/ocaml-modules/lwt_eio/default.nix new file mode 100644 index 000000000000..2fa9aed6cca1 --- /dev/null +++ b/pkgs/development/ocaml-modules/lwt_eio/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildDunePackage, + fetchurl, + eio, + lwt, +}: +buildDunePackage rec { + pname = "lwt_eio"; + version = "0.5.1"; + + minimalOCamlVersion = "5.1"; + + src = fetchurl { + url = "https://github.com/ocaml-multicore/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + hash = "sha256-dlJnhHh4VNO60NZJZqc1HS8wPR95WhdeBJTK37pPbCE="; + }; + + propagatedBuildInputs = [ + eio + lwt + ]; + + meta = { + homepage = "https://github.com/ocaml-multicore/${pname}"; + changelog = "https://github.com/ocaml-multicore/${pname}/raw/v${version}/CHANGES.md"; + description = "Use Lwt libraries from within Eio"; + license = with lib.licenses; [ isc ]; + }; +} diff --git a/pkgs/development/python-modules/typedunits/default.nix b/pkgs/development/python-modules/typedunits/default.nix index 3f0ed6e1d4ac..941db335c3e0 100644 --- a/pkgs/development/python-modules/typedunits/default.nix +++ b/pkgs/development/python-modules/typedunits/default.nix @@ -42,7 +42,7 @@ buildPythonPackage { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isAarch [ # Rounding differences "test_float_to_twelths_frac" ]; diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index ec5c1056188c..174be9aacc18 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -14,12 +14,12 @@ let # kernel config in the xanmod version commit variants = { lts = { - version = "6.12.28"; - hash = "sha256-afmAC1tdiggI2qN1Kf9fJiUJqC9d8gzTj5PAg7wsiuw="; + version = "6.12.30"; + hash = "sha256-OqO41rbb3nBegL+ZjgqR0RGwrka6oLv0QOYXJ8Wdpv8="; }; main = { - version = "6.14.6"; - hash = "sha256-wI383p+g03RrNUkPdo0TnB1n5yZI7bGwcSjB/9HpQH0="; + version = "6.14.8"; + hash = "sha256-ap3NaM/pk+TWg3RBRxFJPwnfv2n042r47bo66jhj3ck="; }; }; diff --git a/pkgs/servers/authelia/sources.nix b/pkgs/servers/authelia/sources.nix index 61a553705af0..a12804d8abfc 100644 --- a/pkgs/servers/authelia/sources.nix +++ b/pkgs/servers/authelia/sources.nix @@ -1,14 +1,14 @@ { fetchFromGitHub }: rec { pname = "authelia"; - version = "4.39.3"; + version = "4.39.4"; src = fetchFromGitHub { owner = "authelia"; repo = "authelia"; rev = "v${version}"; - hash = "sha256-HBkHN7c8O07b2ZI6R7KFvdBF5GWuYU6rmisxLMSH5EQ="; + hash = "sha256-OIf7Q84uWk2q+lTBQNHHO11QEl7FBGv2uNx+g2GNHE0="; }; - vendorHash = "sha256-2wJvX6jAjU9iaFMIcC5Qm1agRMPv4fFfsCeTkvXSpYs="; - pnpmDepsHash = "sha256-uy6uKfZpsFEl2n6zOriRsKwlw3av1f0xBF/CwhWLJMU="; + vendorHash = "sha256-Vndkts5e3NSdtTk3rVZSjfuGuafQ3eswoSLLFspXTIw="; + pnpmDepsHash = "sha256-hA9STLJbFw5pFHx2Wi3X6JFsTvHzCMFVS3HEJApQ9zM="; } diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 2ca0e2b9ca51..5e3c9010ed55 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -40,6 +40,42 @@ stdenv.mkDerivation { decode = "base64 -d"; hash = "sha256-08jedwZ1KX1RSs8y9sh7BUvv5xK9tlzZ6uBOR4kS0Jo="; }) + # Linux: Add required MODULE_DESCRIPTION + (fetchpatch { + url = "https://gerrit.openafs.org/changes/16372/revisions/39189eba45542376e668636bd79a93ae6a8a7cd2/patch"; + decode = "base64 -d"; + hash = "sha256-j5ckKQvybEvmlnFs5jX8g8Dfw37LYWGnfsl4hnZ3+A4="; + }) + # linux: inode_ops mkdir returns struct dentry * + (fetchpatch { + url = "https://gerrit.openafs.org/changes/16373/revisions/769847e205d5908a0c430f7bcfbd2f48e19f8bf8/patch"; + decode = "base64 -d"; + hash = "sha256-znv5gunyPnJgi4SRFERJudtYFqiS+AVYDWfvr52Ku3s="; + }) + # Linux: Use __filemap_get_folio() + (fetchpatch { + url = "https://gerrit.openafs.org/changes/16374/revisions/f187add554da9e9c52752edbfa98f486f683cf25/patch"; + decode = "base64 -d"; + hash = "sha256-+ay87ThSn6QyPZcN0+oE01Wqbxmz0Z1KXYwocQCvYLg="; + }) + # Linux: Use folio_wait_locked() + (fetchpatch { + url = "https://gerrit.openafs.org/changes/16375/revisions/87a93f6488585553d833e1397e7f0dae0545cb7e/patch"; + decode = "base64 -d"; + hash = "sha256-MOVX2LFe8OBnvsQ2UdLvwKrwztOmnu1rdIou4CF+EBs="; + }) + # cf: Introduce AC_CHECK_LINUX_SYMBOL + (fetchpatch { + url = "https://gerrit.openafs.org/changes/16376/revisions/bab5968d7f4639d4a0cbe81aaa3e9716dda00632/patch"; + decode = "base64 -d"; + hash = "sha256-d6DZqDTW1uEKSB5PsomS4ix9fYYQzdQVmDATKl6n7x4="; + }) + # cf: check for dentry flag macros/enums + (fetchpatch { + url = "https://gerrit.openafs.org/changes/16377/revisions/f791d8ca4804486c656bc7c221076480df39b465/patch"; + decode = "base64 -d"; + hash = "sha256-7B0VJE3FeSQU1ElvXI5zXCPq1JRLAycyhqIQuDdR7xE="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index f639bd38ef1f..e95c6a36b45d 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "carapace"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bin"; tag = "v${finalAttrs.version}"; - hash = "sha256-VKc4JnezPdbgUIiSOnHIkUCLas//4TMIKiYd71EMamk="; + hash = "sha256-DgWC3IsuHncJzVfWxIGWDxknTAdHJEijvjhO7q14EYQ="; }; - vendorHash = "sha256-APJBCUdicKb81gY3ukhMHVgapDl+4tsMdNHEwZbarKE="; + vendorHash = "sha256-oq1hZ2P093zsI+UAGHi5XfRXqGGxWpR5j7x7N7ng3xE="; ldflags = [ "-s" diff --git a/pkgs/tools/games/pokefinder/default.nix b/pkgs/tools/games/pokefinder/default.nix index ed9d62db08ce..874dc499debc 100644 --- a/pkgs/tools/games/pokefinder/default.nix +++ b/pkgs/tools/games/pokefinder/default.nix @@ -17,24 +17,18 @@ stdenv.mkDerivation rec { pname = "pokefinder"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "Admiral-Fish"; repo = "PokeFinder"; rev = "v${version}"; - sha256 = "R0FrRRQRe0tWrHUoU4PPwOgIsltUEImEMTXL79ISfRE="; + sha256 = "wjHqox0Vxc73/UTcE7LSo/cG9o4eOqkcjTIW99BxsAc="; fetchSubmodules = true; }; patches = [ ./set-desktop-file-name.patch - # fix compatibility with our libstdc++ - # https://github.com/Admiral-Fish/PokeFinder/pull/392 - (fetchpatch { - url = "https://github.com/Admiral-Fish/PokeFinder/commit/2cb1b049cabdf0d1b32c8cf29bf6c9d9c5c55cb0.patch"; - hash = "sha256-F/w7ydsZ5tZParMWi33W3Tv8A6LLiJt4dAoCrs40DIo="; - }) ]; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c5afa23f43c..68f275e9a295 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14695,8 +14695,6 @@ with pkgs; zotero_7 = pkgs.zotero; - zsteg = callPackage ../tools/security/zsteg { }; - zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { guiModule = "zest"; fftw = fftwSinglePrec; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e9bee00dcd49..54e297664378 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1147,6 +1147,8 @@ let lwt-dllist = callPackage ../development/ocaml-modules/lwt-dllist { }; + lwt_eio = callPackage ../development/ocaml-modules/lwt_eio { }; + lwt-exit = callPackage ../development/ocaml-modules/lwt-exit { }; lwt_log = callPackage ../development/ocaml-modules/lwt_log { };