From 307acb885e53acf53c795fc19ca9a9e220dcb733 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 31 Dec 2024 15:33:34 -0300 Subject: [PATCH 001/240] uuu: fix passthru.updateScript version's regex to proper match the version Signed-off-by: Otavio Salvador --- pkgs/by-name/uu/uuu/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/uu/uuu/package.nix b/pkgs/by-name/uu/uuu/package.nix index 5f6bdfe368bf..23a4d7625ab5 100644 --- a/pkgs/by-name/uu/uuu/package.nix +++ b/pkgs/by-name/uu/uuu/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "uuu_\\([0-9.]+\\)" + "uuu_([0-9.]+)" ]; }; From 07a1d5542750c1ebc13862db73e147978bf32383 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 20 Mar 2025 12:59:31 -0400 Subject: [PATCH 002/240] ants: use wrapProgram with --prefix not --set In this way coreutils is not removed from PATH. Fixes #391554 --- pkgs/applications/science/biology/ants/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index fabcfbd708dd..fea8bdeef15e 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' for file in $out/bin/*; do - wrapProgram $file --set PATH "$out/bin" + wrapProgram $file --prefix PATH : "$out/bin" done ''; From 6e7e61cc0c4503b09eaca2dfce4dd5521921dff4 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 23 Mar 2025 13:47:57 +0100 Subject: [PATCH 003/240] {bambootracker,bambootracker-qt6}: 0.6.4 -> 0.6.5 --- .../audio/bambootracker/default.nix | 44 ++++++++++++++----- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 5bf7445d2682..66f3059ddcd8 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, gitUpdater, pkg-config, qmake, @@ -17,17 +18,40 @@ assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null; stdenv.mkDerivation (finalAttrs: { - pname = "bambootracker"; - version = "0.6.4"; + pname = "bambootracker" + lib.optionalString (lib.versionAtLeast qtbase.version "6.0") "-qt6"; + version = "0.6.5"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-tFUliKR55iZybNyYIF1FXh8RGf8jKEsGrWBuldB277g="; + hash = "sha256-WoyOqInOOOIEwsMOc2yoTdh9UhJOvFKE1GfkxOuXDe0="; }; + patches = [ + # Remove when version > 0.6.5 + (fetchpatch { + name = "0001-bambootracker-Fix-compiler-warnings.patch"; + url = "https://github.com/BambooTracker/BambooTracker/commit/d670cf8b6113318cd938cf19be76b6b14d3635f1.patch"; + hash = "sha256-yyOMaOYKSc1hbbCL7wjFNPDmX2oMYo10J4hjZJss2zs="; + }) + + # Remove when version > 0.6.5 + (fetchpatch { + name = "0002-bambootracker-Fix-GCC15-compat.patch"; + url = "https://github.com/BambooTracker/BambooTracker/commit/92c0a7d1cfb05d1c6ae9482181c5c378082b772c.patch"; + hash = "sha256-6K0RZD0LevggxFr92LaNmq+eMgOFJgFX60IgAw7tYdM="; + }) + + # Remove when version > 0.6.5 + (fetchpatch { + name = "0003-bambootracker-Drop-unused-property.patch"; + url = "https://github.com/BambooTracker/BambooTracker/commit/de4459f0315f099d3e0a2d20b938ec76285f2d46.patch"; + hash = "sha256-zTh6i+hgQZ3kEid0IzQaR/PsrYlnhplccdlaS5g8FeA="; + }) + ]; + postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") '' # Work around lrelease finding in qmake being broken by using pre-Qt5.12 code path # https://github.com/NixOS/nixpkgs/issues/214765 @@ -60,9 +84,9 @@ stdenv.mkDerivation (finalAttrs: { "CONFIG+=system_rtaudio" "CONFIG+=system_rtmidi" ] - ++ lib.optionals (stdenv.cc.isClang || (lib.versionAtLeast qtbase.version "6.0")) [ + ++ lib.optionals stdenv.cc.isClang [ # Clang is extra-strict about some deprecations - # Latest Qt6 deprecated QCheckBox::stateChanged(int) + # https://github.com/BambooTracker/BambooTracker/issues/506 "CONFIG+=no_warnings_are_errors" ]; @@ -84,12 +108,12 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "Tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; mainProgram = "BambooTracker"; homepage = "https://bambootracker.github.io/BambooTracker/"; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ OPNA2608 ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ OPNA2608 ]; }; }) From 44fa0d91d7c909f294003538670102b9427cacb0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 23 Mar 2025 13:49:01 +0100 Subject: [PATCH 004/240] {bambootracker,bambootracker-qt6}: Migrate to pkgs/by-name --- .../ba/bambootracker/package.nix} | 52 +++++++++++-------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 30 insertions(+), 25 deletions(-) rename pkgs/{applications/audio/bambootracker/default.nix => by-name/ba/bambootracker/package.nix} (83%) diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/by-name/ba/bambootracker/package.nix similarity index 83% rename from pkgs/applications/audio/bambootracker/default.nix rename to pkgs/by-name/ba/bambootracker/package.nix index 66f3059ddcd8..5b96caa3e842 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/by-name/ba/bambootracker/package.nix @@ -4,21 +4,19 @@ fetchFromGitHub, fetchpatch, gitUpdater, + libsForQt5, pkg-config, - qmake, - qt5compat ? null, - qtbase, - qttools, - qtwayland, + qt6Packages, rtaudio_6, rtmidi, - wrapQtAppsHook, + withQt6 ? false, }: -assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null; - +let + qtPackages = if withQt6 then qt6Packages else libsForQt5; +in stdenv.mkDerivation (finalAttrs: { - pname = "bambootracker" + lib.optionalString (lib.versionAtLeast qtbase.version "6.0") "-qt6"; + pname = "bambootracker" + lib.optionalString withQt6 "-qt6"; version = "0.6.5"; src = fetchFromGitHub { @@ -52,32 +50,40 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") '' + postPatch = lib.optionalString withQt6 '' # Work around lrelease finding in qmake being broken by using pre-Qt5.12 code path # https://github.com/NixOS/nixpkgs/issues/214765 substituteInPlace BambooTracker/lang/lang.pri \ --replace 'equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 12)' 'if(true)' ''; - nativeBuildInputs = [ - pkg-config - qmake - qttools - wrapQtAppsHook - ]; + nativeBuildInputs = + [ + pkg-config + ] + ++ (with qtPackages; [ + qmake + qttools + wrapQtAppsHook + ]); buildInputs = [ - qtbase rtaudio_6 rtmidi ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland - ] - ++ lib.optionals (lib.versionAtLeast qtbase.version "6.0") [ - qt5compat - ]; + ++ ( + with qtPackages; + [ + qtbase + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + qtwayland + ] + ++ lib.optionals withQt6 [ + qt5compat + ] + ); qmakeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c58ea108f2c7..dbf63c9f8488 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12830,8 +12830,7 @@ with pkgs; av-98 = callPackage ../applications/networking/browsers/av-98 { }; - bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; - bambootracker-qt6 = qt6Packages.callPackage ../applications/audio/bambootracker { }; + bambootracker-qt6 = bambootracker.override { withQt6 = true; }; schismtracker = callPackage ../applications/audio/schismtracker { inherit (darwin.apple_sdk.frameworks) Cocoa; From 8936931884411f05f52957a4c0757c9012031934 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Sat, 29 Mar 2025 01:00:37 -0400 Subject: [PATCH 005/240] morphosis: 1.4.1 -> 48.1 Diff: https://gitlab.gnome.org/World/morphosis/-/compare/v1.4.1..48.1 --- pkgs/by-name/mo/morphosis/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/morphosis/package.nix b/pkgs/by-name/mo/morphosis/package.nix index 7a9271d4dcd5..72eae1709170 100644 --- a/pkgs/by-name/mo/morphosis/package.nix +++ b/pkgs/by-name/mo/morphosis/package.nix @@ -20,15 +20,15 @@ python3Packages.buildPythonApplication rec { pname = "morphosis"; - version = "1.4.1"; + version = "48.1"; pyproject = false; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "morphosis"; - rev = "refs/tags/v${version}"; - hash = "sha256-ZpxenBqC5qr7yNwjld0u7gSBQfL7Kpa4FWE9gkzG0hg="; + tag = version; + hash = "sha256-8Z1c0TtMAOPxzaFhEHDURTk2islHky8B/EIAdmj5hE0="; }; strictDeps = true; From 20dad1493ffbaf3d75dfbfa1e3b9aa566fa811dd Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 31 Mar 2025 14:18:17 +0200 Subject: [PATCH 006/240] dbus-cpp: 5.0.3 -> 5.0.4 --- pkgs/by-name/db/dbus-cpp/package.nix | 53 ++++++++++------------------ 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix index b9ab77c35dd5..976125f91625 100644 --- a/pkgs/by-name/db/dbus-cpp/package.nix +++ b/pkgs/by-name/db/dbus-cpp/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, testers, boost186, @@ -20,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dbus-cpp"; - version = "5.0.3"; + version = "5.0.4"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lib-cpp/dbus-cpp"; - rev = finalAttrs.version; - hash = "sha256-t8SzPRUuKeEchT8vAsITf8MwbgHA+mR5C9CnkdVyX7s="; + tag = finalAttrs.version; + hash = "sha256-ki4bnwRpvmB9yzt/Mn3MQs1Dr6Vrcs2D0tvCjvvfmq4="; }; outputs = [ @@ -36,39 +35,22 @@ stdenv.mkDerivation (finalAttrs: { "examples" ]; - patches = [ - # Handle already-stolen dbus call better - # Remove when version > 5.0.3 - (fetchpatch { - name = "0001-dbus-cpp-src-Dont-steal-a-pending-dbus-call-more-then-once.patch"; - url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/9f3d1ff2b1c6c732285949c3dbb35e40cf55ea92.patch"; - hash = "sha256-xzOCIJVsK2J+X9RsV930R9uw6h4UxqwSaNOgv8v4qQU="; - }) - - # Fix GCC13 compilation - # Remove when version > 5.0.3 - (fetchpatch { - name = "0002-dbus-cpp-Add-missing-headers-for-GCC13.patch"; - url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/c761b1eec084962dbe64d35d7f7b86dcbe57a3f7.patch"; - hash = "sha256-/tKe3iHWxP9jWtpdgwwRynj8565u9LxCt4WXJDXzgX4="; - }) - ]; - postPatch = '' substituteInPlace doc/CMakeLists.txt \ - --replace 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}' + --replace-fail 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}' # Warning on aarch64-linux breaks build due to -Werror substituteInPlace CMakeLists.txt \ - --replace '-Werror' "" + --replace-fail '-Werror' "" # pkg-config output patching hook expects prefix variable here substituteInPlace data/dbus-cpp.pc.in \ - --replace 'includedir=''${exec_prefix}' 'includedir=''${prefix}' + --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}' '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' - sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt + substituteInPlace CMakeLists.txt \ + --replace-fail 'add_subdirectory(tests)' '# add_subdirectory(tests)' ''; strictDeps = true; @@ -98,11 +80,10 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DDBUS_CPP_ENABLE_DOC_GENERATION=ON" + (lib.cmakeBool "DBUS_CPP_ENABLE_DOC_GENERATION" true) ]; - # Too flaky on ARM CI & for some amd64 users - doCheck = false; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # DBus, parallelism messes with communication enableParallelChecking = false; @@ -112,17 +93,21 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Dbus-binding leveraging C++-11"; homepage = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ OPNA2608 ]; + changelog = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/blob/${finalAttrs.version}/ChangeLog"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ OPNA2608 ]; mainProgram = "dbus-cppc"; - platforms = platforms.linux; + platforms = lib.platforms.linux; pkgConfigModules = [ "dbus-cpp" ]; From 3ade643fd4a66c0fcce71e3e866e701bca3e83c8 Mon Sep 17 00:00:00 2001 From: kiria-moe Date: Tue, 1 Apr 2025 18:24:56 +0800 Subject: [PATCH 007/240] trojan-go: fix Trojan-go's all functionalities need to be enabled explicitly. --- pkgs/by-name/tr/trojan-go/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/tr/trojan-go/package.nix b/pkgs/by-name/tr/trojan-go/package.nix index 40087b8834b7..7d75473ce924 100644 --- a/pkgs/by-name/tr/trojan-go/package.nix +++ b/pkgs/by-name/tr/trojan-go/package.nix @@ -19,6 +19,15 @@ buildGoModule rec { vendorHash = "sha256-c6H/8/dmCWasFKVR15U/kty4AzQAqmiL/VLKrPtH+s4="; + tags = [ + "api" + "client" + "server" + "forward" + "nat" + "other" + ]; + # tests fail due to requiring networking doCheck = false; From 81c4342563fe3e9b686d3919be5038db83b4f3bf Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 11 Mar 2025 20:03:07 -0300 Subject: [PATCH 008/240] python312Packages.smp: init at 3.3.1 Signed-off-by: Otavio Salvador --- .../python-modules/smp/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/smp/default.nix diff --git a/pkgs/development/python-modules/smp/default.nix b/pkgs/development/python-modules/smp/default.nix new file mode 100644 index 000000000000..8f4ec2f8fe41 --- /dev/null +++ b/pkgs/development/python-modules/smp/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + cbor2, + crcmod, + eval-type-backport, + pydantic, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "smp"; + version = "3.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "JPHutchins"; + repo = "smp"; + tag = version; + hash = "sha256-TjucQm07nbfuFrVOHGOVA/f1rQRQfU8ws8VVC+U/kp8="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + cbor2 + crcmod + eval-type-backport + pydantic + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "smp" + ]; + + meta = { + description = "Simple Management Protocol (SMP) for remotely managing MCU firmware"; + homepage = "https://github.com/JPHutchins/smp"; + changelog = "https://github.com/JPHutchins/smp/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ otavio ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 323fb7e029e9..607e0ec1757a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15852,6 +15852,8 @@ self: super: with self; { smolagents = callPackage ../development/python-modules/smolagents { }; + smp = callPackage ../development/python-modules/smp { }; + smpp-pdu = callPackage ../development/python-modules/smpp-pdu { }; smpplib = callPackage ../development/python-modules/smpplib { }; From 38fb09df80322c6e0bffc45d71df3e072f64a321 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 11 Mar 2025 20:04:12 -0300 Subject: [PATCH 009/240] python312Packages.smpclient: init at 4.4.2 Signed-off-by: Otavio Salvador --- .../python-modules/smpclient/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/smpclient/default.nix diff --git a/pkgs/development/python-modules/smpclient/default.nix b/pkgs/development/python-modules/smpclient/default.nix new file mode 100644 index 000000000000..7b51f0955b9d --- /dev/null +++ b/pkgs/development/python-modules/smpclient/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + async-timeout, + bleak, + intelhex, + pyserial, + smp, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "smpclient"; + version = "4.4.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "intercreate"; + repo = "smpclient"; + tag = version; + hash = "sha256-qbf0xGK1RYaeEIAsbkZ2cWj/MQrmVwm2IKmOkihxBDE="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + async-timeout + bleak + intelhex + pyserial + smp + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonRelaxDeps = [ + "smp" + ]; + + pythonImportsCheck = [ + "smpclient" + ]; + + meta = { + description = "Simple Management Protocol (SMP) Client for remotely managing MCU firmware"; + homepage = "https://github.com/intercreate/smpclient"; + changelog = "https://github.com/intercreate/smpclient/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ otavio ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 607e0ec1757a..a72bd71169e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15854,6 +15854,8 @@ self: super: with self; { smp = callPackage ../development/python-modules/smp { }; + smpclient = callPackage ../development/python-modules/smpclient { }; + smpp-pdu = callPackage ../development/python-modules/smpp-pdu { }; smpplib = callPackage ../development/python-modules/smpplib { }; From 381aa66c682ed747cff7d9f79bab923dd9ccbc9e Mon Sep 17 00:00:00 2001 From: Silvio Ankermann Date: Thu, 20 Mar 2025 21:13:11 +0100 Subject: [PATCH 010/240] mum: init at 0.5.1 --- pkgs/by-name/mu/mum/package.nix | 68 +++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 pkgs/by-name/mu/mum/package.nix diff --git a/pkgs/by-name/mu/mum/package.nix b/pkgs/by-name/mu/mum/package.nix new file mode 100644 index 000000000000..0cc9ce86e3ab --- /dev/null +++ b/pkgs/by-name/mu/mum/package.nix @@ -0,0 +1,68 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + cmake, + pkg-config, + alsa-lib, + gdk-pixbuf, + glib, + libnotify, + libopus, + openssl, + versionCheckHook, + nix-update-script, + installShellFiles, + + withNotifications ? true, + withOgg ? true, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "mum"; + version = "0.5.1"; + src = fetchFromGitHub { + owner = "mum-rs"; + repo = "mum"; + tag = "v${finalAttrs.version}"; + hash = "sha256-r2isuwXq79dOQQWB+CsofYCLQYu9VKm7kzoxw103YV4="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-ey3nT6vZ5YOZGk08HykK9RxI7li+Sz+sER3HioGSXP0="; + + nativeBuildInputs = [ + cmake + pkg-config + installShellFiles + ]; + + buildInputs = [ + alsa-lib + gdk-pixbuf + glib + libopus + openssl + ] ++ lib.optional withNotifications libnotify; + + buildNoDefaultFeatures = true; + buildFeatures = lib.optional withNotifications "notifications" ++ lib.optional withOgg "ogg"; + + postInstall = '' + installManPage documentation/*.{1,5} + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/mumctl"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Daemon/cli mumble client"; + homepage = "https://github.com/mum-rs/mum"; + changelog = "https://github.com/mum-rs/mum/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ lykos153 ]; + license = lib.licenses.mit; + }; +}) From 97da8b0cf41a22bf24d52e1df8d496889d4571b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Apr 2025 12:47:25 +0000 Subject: [PATCH 011/240] mathgl: 8.0.2 -> 8.0.3 --- pkgs/by-name/ma/mathgl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mathgl/package.nix b/pkgs/by-name/ma/mathgl/package.nix index 45095e7f2bf7..6d5f8cee965a 100644 --- a/pkgs/by-name/ma/mathgl/package.nix +++ b/pkgs/by-name/ma/mathgl/package.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation rec { pname = "mathgl"; - version = "8.0.2"; + version = "8.0.3"; src = fetchurl { url = "mirror://sourceforge/mathgl/mathgl-${version}.tar.gz"; - sha256 = "sha256-cWYJlWhKawooI/Z49sQ4q6ukdKEVJGzfX5sLRgq/ysE="; + sha256 = "sha256-m7qe5qD4bRuPPzugN008t3b3ctu28aAWhMpsC9ViBNY="; }; nativeBuildInputs = [ From 2621c21a2a840a5bf9d7677899062d98eeb25bdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Apr 2025 02:59:32 +0000 Subject: [PATCH 012/240] python312Packages.marimo: 0.11.20 -> 0.12.2 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 58400d0aba6d..af0d1d4639ef 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -33,13 +33,13 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.11.20"; + version = "0.12.2"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-94UP5kDKQ5JS9egEOuMQQoewSTctIRRPt0b50yYg+r8="; + hash = "sha256-FrOuujO0YUneQYQdnVKKzJIGqfcUoHDWpf28SJlAgOY="; }; build-system = [ hatchling ]; From bf1c61d16adf3ba583d4bdeafa309b01a9e15edf Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Thu, 3 Apr 2025 13:47:00 +0300 Subject: [PATCH 013/240] netexec: fix eval --- pkgs/tools/security/netexec/default.nix | 67 +++++++++++++++---------- 1 file changed, 40 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/security/netexec/default.nix b/pkgs/tools/security/netexec/default.nix index f3145427148f..4b507161da47 100644 --- a/pkgs/tools/security/netexec/default.nix +++ b/pkgs/tools/security/netexec/default.nix @@ -2,30 +2,44 @@ lib, stdenv, fetchFromGitHub, - python3, + buildPythonApplication, + pytestCheckHook, + # Deps + poetry-core, + poetry-dynamic-versioning, + aardwolf, + aioconsole, + aiosqlite, + argcomplete, + asyauth, + beautifulsoup4, + bloodhound-py, + dploot, + dsinternals, + lsassy, + masky, + minikerberos, + msgpack, + msldap, + neo4j, + paramiko, + pyasn1-modules, + pylnk3, + pynfsclient, + pypsrp, + pypykatz, + python-dateutil, + python-libnmap, + pywerview, + requests, + rich, + sqlalchemy, + termcolor, + terminaltables, + xmltodict, + impacket, }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - impacket = super.impacket.overridePythonAttrs { - version = "0.12.0.dev1-unstable-2023-11-30"; - src = fetchFromGitHub { - owner = "Pennyw0rth"; - repo = "impacket"; - rev = "d370e6359a410063b2c9c68f6572c3b5fb178a38"; - hash = "sha256-Jozn4lKAnLQ2I53+bx0mFY++OH5P4KyqVmrS5XJUY3E="; - }; - # Fix version to be compliant with Python packaging rules - postPatch = '' - substituteInPlace setup.py \ - --replace 'version="{}.{}.{}.{}{}"' 'version="{}.{}.{}"' - ''; - }; - }; - }; -in -python.pkgs.buildPythonApplication rec { +buildPythonApplication rec { pname = "netexec"; version = "1.3.0"; pyproject = true; @@ -50,12 +64,12 @@ python.pkgs.buildPythonApplication rec { --replace-fail '{ git = "https://github.com/Pennyw0rth/NfsClient" }' '"*"' ''; - build-system = with python.pkgs; [ + build-system = [ poetry-core poetry-dynamic-versioning ]; - dependencies = with python.pkgs; [ + dependencies = [ aardwolf aioconsole aiosqlite @@ -65,7 +79,6 @@ python.pkgs.buildPythonApplication rec { bloodhound-py dploot dsinternals - impacket lsassy masky minikerberos @@ -89,7 +102,7 @@ python.pkgs.buildPythonApplication rec { xmltodict ]; - nativeCheckInputs = with python.pkgs; [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # Tests no longer works out-of-box with 1.3.0 doCheck = false; From e7a3460b0af54517e59433b535a0ca5037ab962f Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Thu, 3 Apr 2025 13:48:43 +0300 Subject: [PATCH 014/240] netexec: modernize Since finalAttrs is not supported, this is just removing \with lib;` --- pkgs/tools/security/netexec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/netexec/default.nix b/pkgs/tools/security/netexec/default.nix index 4b507161da47..c8741909129e 100644 --- a/pkgs/tools/security/netexec/default.nix +++ b/pkgs/tools/security/netexec/default.nix @@ -111,12 +111,12 @@ buildPythonApplication rec { export HOME=$(mktemp -d) ''; - meta = with lib; { + meta = { description = "Network service exploitation tool (maintained fork of CrackMapExec)"; homepage = "https://github.com/Pennyw0rth/NetExec"; changelog = "https://github.com/Pennyw0rth/NetExec/releases/tag/v${version}"; - license = licenses.bsd2; - maintainers = with maintainers; [ vncsb ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ vncsb ]; mainProgram = "nxc"; # FIXME: failing fixupPhase: # $ Rewriting #!/nix/store/-python3-3.11.7/bin/python3.11 to #!/nix/store/-python3-3.11.7 From b0637e8470aa027965309d1513534cd714edb9c7 Mon Sep 17 00:00:00 2001 From: Sam Willcocks Date: Thu, 3 Apr 2025 13:37:00 +0100 Subject: [PATCH 015/240] sbom-utility: Fix version, add shell completions --- pkgs/by-name/sb/sbom-utility/name.patch | 13 +++++ pkgs/by-name/sb/sbom-utility/package.nix | 41 +++++++++++++- pkgs/by-name/sb/sbom-utility/stderr.patch | 67 +++++++++++++++++++++++ 3 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/sb/sbom-utility/name.patch create mode 100644 pkgs/by-name/sb/sbom-utility/stderr.patch diff --git a/pkgs/by-name/sb/sbom-utility/name.patch b/pkgs/by-name/sb/sbom-utility/name.patch new file mode 100644 index 000000000000..0edbb05706d4 --- /dev/null +++ b/pkgs/by-name/sb/sbom-utility/name.patch @@ -0,0 +1,13 @@ +diff --git a/cmd/root.go b/cmd/root.go +index 5ef5d46..e99b245 100644 +--- a/cmd/root.go ++++ b/cmd/root.go +@@ -139,7 +139,7 @@ const ( + ) + + var rootCmd = &cobra.Command{ +- Use: fmt.Sprintf("%s [command] [flags]", utils.GlobalFlags.Project), ++ Use: fmt.Sprintf("sbom-utility [command] [flags]"), + SilenceErrors: false, + SilenceUsage: false, + Short: MSG_APP_NAME, diff --git a/pkgs/by-name/sb/sbom-utility/package.nix b/pkgs/by-name/sb/sbom-utility/package.nix index e6f4ac7a5701..6ebfbcbfe73d 100644 --- a/pkgs/by-name/sb/sbom-utility/package.nix +++ b/pkgs/by-name/sb/sbom-utility/package.nix @@ -2,11 +2,18 @@ lib, buildGoModule, fetchFromGitHub, + fetchpatch, + versionCheckHook, + installShellFiles, + stdenv, }: -buildGoModule rec { - pname = "sbom-utility"; +let version = "0.17.0"; +in +buildGoModule { + pname = "sbom-utility"; + inherit version; src = fetchFromGitHub { owner = "CycloneDX"; @@ -17,10 +24,40 @@ buildGoModule rec { vendorHash = "sha256-vyYSir5u6d5nv+2ScrHpasQGER4VFSoLb1FDUDIrtDM="; + patches = [ + # work around https://github.com/CycloneDX/sbom-utility/issues/121, which otherwise + # breaks shell completions + ./name.patch + # Output logs to stderr rather than stdout. + # Patch of https://github.com/CycloneDX/sbom-utility/pull/122, adapted to apply + # against v0.17.0 + ./stderr.patch + ]; + + ldflags = [ + "-X main.Version=${version}" + ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + preCheck = '' cd test ''; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + for shell in bash fish zsh; do + installShellCompletion --cmd sbom-utility \ + --$shell <($out/bin/sbom-utility -q completion $shell) + done + ''; + meta = with lib; { description = "Utility that provides an API platform for validating, querying and managing BOM data"; homepage = "https://github.com/CycloneDX/sbom-utility"; diff --git a/pkgs/by-name/sb/sbom-utility/stderr.patch b/pkgs/by-name/sb/sbom-utility/stderr.patch new file mode 100644 index 000000000000..779c53d624d9 --- /dev/null +++ b/pkgs/by-name/sb/sbom-utility/stderr.patch @@ -0,0 +1,67 @@ +diff --git a/log/log.go b/log/log.go +index 2615f0a..c82b6c5 100644 +--- a/log/log.go ++++ b/log/log.go +@@ -104,7 +104,7 @@ func NewDefaultLogger() *MiniLogger { + tagEnter: DEFAULT_ENTER_TAG, + tagExit: DEFAULT_EXIT_TAG, + tagColor: color.New(color.FgMagenta), +- outputFile: os.Stdout, ++ outputFile: os.Stderr, + maxStrLength: 64, + } + +@@ -361,7 +361,7 @@ func (log MiniLogger) dumpInterface(lvl Level, tag string, value interface{}, sk + } + + // TODO: use a general output writer (set to stdout, stderr, or file stream) +- fmt.Println(sb.String()) ++ fmt.Fprintln(log.outputFile, sb.String()) + } else { + os.Stderr.WriteString("Error: Unable to retrieve call stack. Exiting...") + os.Exit(-2) +@@ -370,7 +370,7 @@ func (log MiniLogger) dumpInterface(lvl Level, tag string, value interface{}, sk + } + + func (log MiniLogger) DumpString(value string) { +- fmt.Print(value) ++ fmt.Fprint(log.outputFile, value) + } + + func (log MiniLogger) DumpStruct(structName string, field interface{}) error { +@@ -389,7 +389,7 @@ func (log MiniLogger) DumpStruct(structName string, field interface{}) error { + } + + // TODO: print to output stream +- fmt.Println(sb.String()) ++ fmt.Fprintln(log.outputFile, sb.String()) + + return nil + } +@@ -398,8 +398,8 @@ func (log MiniLogger) DumpArgs() { + args := os.Args + for i, a := range args { + // TODO: print to output stream +- fmt.Print(log.indentRunes) +- fmt.Printf("os.Arg[%d]: `%v`\n", i, a) ++ fmt.Fprint(log.outputFile, log.indentRunes) ++ fmt.Fprintf(log.outputFile, "os.Arg[%d]: `%v`\n", i, a) + } + } + +@@ -409,7 +409,7 @@ func (log MiniLogger) DumpSeparator(sep byte, repeat int) (string, error) { + for i := 0; i < repeat; i++ { + sb.WriteByte(sep) + } +- fmt.Println(sb.String()) ++ fmt.Fprintln(log.outputFile, sb.String()) + return sb.String(), nil + } else { + return "", errors.New("invalid repeat length (>80)") +@@ -417,5 +417,5 @@ func (log MiniLogger) DumpSeparator(sep byte, repeat int) (string, error) { + } + + func (log *MiniLogger) DumpStackTrace() { +- fmt.Println(string(debug.Stack())) ++ fmt.Fprintln(log.outputFile, string(debug.Stack())) + } From f4890983c4ba74d440c7ea816e95fbf8d09bfa47 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 3 Apr 2025 18:37:46 +0000 Subject: [PATCH 016/240] textpieces: 4.1.1-1 -> 4.2.0 Diff: https://gitlab.com/liferooter/textpieces/-/compare/v4.1.1-1..v4.2.0 --- pkgs/by-name/te/textpieces/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/te/textpieces/package.nix b/pkgs/by-name/te/textpieces/package.nix index 2dfb547531ce..8030ac5638bc 100644 --- a/pkgs/by-name/te/textpieces/package.nix +++ b/pkgs/by-name/te/textpieces/package.nix @@ -20,18 +20,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "textpieces"; - version = "4.1.1-1"; + version = "4.2.0"; src = fetchFromGitLab { owner = "liferooter"; repo = "textpieces"; - rev = "v${finalAttrs.version}"; - hash = "sha256-+CmlJrND61w1qXSUgIsacBoJcmmf9eLI2GSvDJbXv44="; + tag = "v${finalAttrs.version}"; + hash = "sha256-JFHDPzVRD3HZI9+TBCe92xTcuIPAF/iD8hIiYPgetLc="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; - hash = "sha256-fpnXMzQFne/TnRgjWy47nVlcwXFZJG4S+VD+D6bz5iQ="; + inherit (finalAttrs) pname version src; + hash = "sha256-SMNyPo0y8376wjuZVyu3jMjfPgddEMrqCPvUzsYa0xc="; }; nativeBuildInputs = [ From d6cc7473d5a571463c836beedbb7f952c5baa8eb Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 3 Apr 2025 18:37:54 +0000 Subject: [PATCH 017/240] turbo: 2.4.5-canary.4 -> 2.5.0 Diff: https://github.com/vercel/turborepo/compare/v2.4.5-canary.4...v2.5.0 Changelog: https://github.com/vercel/turborepo/releases/tag/v2.5.0 --- pkgs/by-name/tu/turbo-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index f01de7e53a1d..631262f158e8 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "turbo-unwrapped"; - version = "2.4.5-canary.4"; + version = "2.5.0"; src = fetchFromGitHub { owner = "vercel"; repo = "turborepo"; tag = "v${finalAttrs.version}"; - hash = "sha256-tQ/Xocpk48eRhCyfRZx2rkAVqNn115rO3MRYF5fC2nI="; + hash = "sha256-crpEJdhO27cVXl4YnPmUwvJFAeezcxdS/vJPJ2m1VU8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-pngzlmkntTCv5/aw1UNbDGNQOVtMgFZHc2woj6R0vys="; + cargoHash = "sha256-7pcJ7NUTLe9rxLWnviJbWtTg1P145BzL1ZfWcuxPlSc="; nativeBuildInputs = [ From c2fc19b6bc741601c76cc28b14e14c7d8166c5d9 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sat, 29 Mar 2025 16:12:36 -0700 Subject: [PATCH 018/240] goocanvas: unbreak GCC 14, modernize --- pkgs/development/libraries/goocanvas/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 6e4655a872e3..4f649b92f442 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -9,13 +9,13 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "goocanvas"; version = "1.0.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "07kicpcacbqm3inp7zq32ldp95mxx4kfxpaazd0x5jk7hpw2w1qw"; + url = "mirror://gnome/sources/goocanvas/${lib.versions.majorMinor finalAttrs.version}/goocanvas-${finalAttrs.version}.tar.bz2"; + hash = "sha256-HAcu+IVnytJB+0rd7ibpvZZ0GxUD/3NtHBUvpthlcR4="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,9 +25,11 @@ stdenv.mkDerivation rec { glib ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "goocanvas"; versionPolicy = "odd-unstable"; freeze = true; }; @@ -39,4 +41,4 @@ stdenv.mkDerivation rec { license = licenses.lgpl2; platforms = lib.platforms.unix; }; -} +}) From e5357ed567ecf6f41ad871a5c7c163183d8f0c48 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sun, 30 Mar 2025 17:46:39 -0700 Subject: [PATCH 019/240] perlPackages.goocanvas: unbreak on GCC 14 --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 10b69fde6708..8f006b8dcdc8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14917,6 +14917,7 @@ with self; pkgs.gtk2 Gtk2 ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion -Wno-error=implicit-function-declaration"; meta = { description = "Perl interface to the GooCanvas"; license = with lib.licenses; [ From 410e151ba4b8052bd0f292ab8b5edbed3833e233 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Apr 2025 08:59:53 -0500 Subject: [PATCH 020/240] hardware.bluetooth: fix configuration directory mode bluetooth.service: ConfigurationDirectory 'bluetooth' already exists but the mode is different. (File system: 755 ConfigurationDirectoryMode: 555) --- nixos/modules/services/hardware/bluetooth.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index d8907d554d33..518c129dc405 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -151,6 +151,7 @@ in CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" # sockets and tethering ]; + ConfigurationDirectoryMode = "0755"; NoNewPrivileges = true; RestrictNamespaces = true; ProtectControlGroups = true; From 05ea580ee9aa5cad380371d54b17be68fbee0aa2 Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Fri, 3 Jan 2025 11:34:14 +0800 Subject: [PATCH 021/240] baikal: init at 0.10.1 --- pkgs/by-name/ba/baikal/composer.lock | 3208 ++++++++++++++++++++++++++ pkgs/by-name/ba/baikal/package.nix | 25 + 2 files changed, 3233 insertions(+) create mode 100644 pkgs/by-name/ba/baikal/composer.lock create mode 100644 pkgs/by-name/ba/baikal/package.nix diff --git a/pkgs/by-name/ba/baikal/composer.lock b/pkgs/by-name/ba/baikal/composer.lock new file mode 100644 index 000000000000..912df439a5fe --- /dev/null +++ b/pkgs/by-name/ba/baikal/composer.lock @@ -0,0 +1,3208 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "f91906fb4e71dc307de14dd620e65338", + "packages": [ + { + "name": "psr/log", + "version": "1.1.4", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "Psr/Log/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "support": { + "source": "https://github.com/php-fig/log/tree/1.1.4" + }, + "time": "2021-05-03T11:20:27+00:00" + }, + { + "name": "sabre/dav", + "version": "4.7.0", + "source": { + "type": "git", + "url": "https://github.com/sabre-io/dav.git", + "reference": "074373bcd689a30bcf5aaa6bbb20a3395964ce7a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabre-io/dav/zipball/074373bcd689a30bcf5aaa6bbb20a3395964ce7a", + "reference": "074373bcd689a30bcf5aaa6bbb20a3395964ce7a", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-date": "*", + "ext-dom": "*", + "ext-iconv": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-pcre": "*", + "ext-simplexml": "*", + "ext-spl": "*", + "lib-libxml": ">=2.7.0", + "php": "^7.1.0 || ^8.0", + "psr/log": "^1.0 || ^2.0 || ^3.0", + "sabre/event": "^5.0", + "sabre/http": "^5.0.5", + "sabre/uri": "^2.0", + "sabre/vobject": "^4.2.1", + "sabre/xml": "^2.0.1" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.19", + "monolog/monolog": "^1.27 || ^2.0", + "phpstan/phpstan": "^0.12 || ^1.0", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6" + }, + "suggest": { + "ext-curl": "*", + "ext-imap": "*", + "ext-pdo": "*" + }, + "bin": [ + "bin/sabredav", + "bin/naturalselection" + ], + "type": "library", + "autoload": { + "psr-4": { + "Sabre\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" + } + ], + "description": "WebDAV Framework for PHP", + "homepage": "http://sabre.io/", + "keywords": [ + "CalDAV", + "CardDAV", + "WebDAV", + "framework", + "iCalendar" + ], + "support": { + "forum": "https://groups.google.com/group/sabredav-discuss", + "issues": "https://github.com/sabre-io/dav/issues", + "source": "https://github.com/fruux/sabre-dav" + }, + "time": "2024-10-29T11:46:02+00:00" + }, + { + "name": "sabre/event", + "version": "5.1.7", + "source": { + "type": "git", + "url": "https://github.com/sabre-io/event.git", + "reference": "86d57e305c272898ba3c28e9bd3d65d5464587c2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabre-io/event/zipball/86d57e305c272898ba3c28e9bd3d65d5464587c2", + "reference": "86d57e305c272898ba3c28e9bd3d65d5464587c2", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.17.1||^3.63", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6" + }, + "type": "library", + "autoload": { + "files": [ + "lib/coroutine.php", + "lib/Loop/functions.php", + "lib/Promise/functions.php" + ], + "psr-4": { + "Sabre\\Event\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" + } + ], + "description": "sabre/event is a library for lightweight event-based programming", + "homepage": "http://sabre.io/event/", + "keywords": [ + "EventEmitter", + "async", + "coroutine", + "eventloop", + "events", + "hooks", + "plugin", + "promise", + "reactor", + "signal" + ], + "support": { + "forum": "https://groups.google.com/group/sabredav-discuss", + "issues": "https://github.com/sabre-io/event/issues", + "source": "https://github.com/fruux/sabre-event" + }, + "time": "2024-08-27T11:23:05+00:00" + }, + { + "name": "sabre/http", + "version": "5.1.12", + "source": { + "type": "git", + "url": "https://github.com/sabre-io/http.git", + "reference": "dedff73f3995578bc942fa4c8484190cac14f139" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabre-io/http/zipball/dedff73f3995578bc942fa4c8484190cac14f139", + "reference": "dedff73f3995578bc942fa4c8484190cac14f139", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-curl": "*", + "ext-mbstring": "*", + "php": "^7.1 || ^8.0", + "sabre/event": ">=4.0 <6.0", + "sabre/uri": "^2.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.17.1||^3.63", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6" + }, + "suggest": { + "ext-curl": " to make http requests with the Client class" + }, + "type": "library", + "autoload": { + "files": [ + "lib/functions.php" + ], + "psr-4": { + "Sabre\\HTTP\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" + } + ], + "description": "The sabre/http library provides utilities for dealing with http requests and responses. ", + "homepage": "https://github.com/fruux/sabre-http", + "keywords": [ + "http" + ], + "support": { + "forum": "https://groups.google.com/group/sabredav-discuss", + "issues": "https://github.com/sabre-io/http/issues", + "source": "https://github.com/fruux/sabre-http" + }, + "time": "2024-08-27T16:07:41+00:00" + }, + { + "name": "sabre/uri", + "version": "2.3.4", + "source": { + "type": "git", + "url": "https://github.com/sabre-io/uri.git", + "reference": "b76524c22de90d80ca73143680a8e77b1266c291" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabre-io/uri/zipball/b76524c22de90d80ca73143680a8e77b1266c291", + "reference": "b76524c22de90d80ca73143680a8e77b1266c291", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^3.63", + "phpstan/extension-installer": "^1.4", + "phpstan/phpstan": "^1.12", + "phpstan/phpstan-phpunit": "^1.4", + "phpstan/phpstan-strict-rules": "^1.6", + "phpunit/phpunit": "^9.6" + }, + "type": "library", + "autoload": { + "files": [ + "lib/functions.php" + ], + "psr-4": { + "Sabre\\Uri\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" + } + ], + "description": "Functions for making sense out of URIs.", + "homepage": "http://sabre.io/uri/", + "keywords": [ + "rfc3986", + "uri", + "url" + ], + "support": { + "forum": "https://groups.google.com/group/sabredav-discuss", + "issues": "https://github.com/sabre-io/uri/issues", + "source": "https://github.com/fruux/sabre-uri" + }, + "time": "2024-08-27T12:18:16+00:00" + }, + { + "name": "sabre/vobject", + "version": "4.5.6", + "source": { + "type": "git", + "url": "https://github.com/sabre-io/vobject.git", + "reference": "900266bb3bd448a9f7f41f82344ad0aba237cb27" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabre-io/vobject/zipball/900266bb3bd448a9f7f41f82344ad0aba237cb27", + "reference": "900266bb3bd448a9f7f41f82344ad0aba237cb27", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": "^7.1 || ^8.0", + "sabre/xml": "^2.1 || ^3.0 || ^4.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.17.1", + "phpstan/phpstan": "^0.12 || ^1.11", + "phpunit/php-invoker": "^2.0 || ^3.1", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6" + }, + "suggest": { + "hoa/bench": "If you would like to run the benchmark scripts" + }, + "bin": [ + "bin/vobject", + "bin/generate_vcards" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Sabre\\VObject\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" + }, + { + "name": "Dominik Tobschall", + "email": "dominik@fruux.com", + "homepage": "http://tobschall.de/", + "role": "Developer" + }, + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net", + "homepage": "http://mnt.io/", + "role": "Developer" + } + ], + "description": "The VObject library for PHP allows you to easily parse and manipulate iCalendar and vCard objects", + "homepage": "http://sabre.io/vobject/", + "keywords": [ + "availability", + "freebusy", + "iCalendar", + "ical", + "ics", + "jCal", + "jCard", + "recurrence", + "rfc2425", + "rfc2426", + "rfc2739", + "rfc4770", + "rfc5545", + "rfc5546", + "rfc6321", + "rfc6350", + "rfc6351", + "rfc6474", + "rfc6638", + "rfc6715", + "rfc6868", + "vCalendar", + "vCard", + "vcf", + "xCal", + "xCard" + ], + "support": { + "forum": "https://groups.google.com/group/sabredav-discuss", + "issues": "https://github.com/sabre-io/vobject/issues", + "source": "https://github.com/fruux/sabre-vobject" + }, + "time": "2024-10-14T11:53:54+00:00" + }, + { + "name": "sabre/xml", + "version": "2.2.11", + "source": { + "type": "git", + "url": "https://github.com/sabre-io/xml.git", + "reference": "01a7927842abf3e10df3d9c2d9b0cc9d813a3fcc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sabre-io/xml/zipball/01a7927842abf3e10df3d9c2d9b0cc9d813a3fcc", + "reference": "01a7927842abf3e10df3d9c2d9b0cc9d813a3fcc", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xmlreader": "*", + "ext-xmlwriter": "*", + "lib-libxml": ">=2.6.20", + "php": "^7.1 || ^8.0", + "sabre/uri": ">=1.0,<3.0.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.17.1||3.63.2", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6" + }, + "type": "library", + "autoload": { + "files": [ + "lib/Deserializer/functions.php", + "lib/Serializer/functions.php" + ], + "psr-4": { + "Sabre\\Xml\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" + }, + { + "name": "Markus Staab", + "email": "markus.staab@redaxo.de", + "role": "Developer" + } + ], + "description": "sabre/xml is an XML library that you may not hate.", + "homepage": "https://sabre.io/xml/", + "keywords": [ + "XMLReader", + "XMLWriter", + "dom", + "xml" + ], + "support": { + "forum": "https://groups.google.com/group/sabredav-discuss", + "issues": "https://github.com/sabre-io/xml/issues", + "source": "https://github.com/fruux/sabre-xml" + }, + "time": "2024-09-06T07:37:46+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:32:20+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-php81", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/yaml", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "e99b4e94d124b29ee4cf3140e1b537d2dad8cec9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/e99b4e94d124b29ee4cf3140e1b537d2dad8cec9", + "reference": "e99b4e94d124b29ee4cf3140e1b537d2dad8cec9", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-ctype": "^1.8" + }, + "conflict": { + "symfony/console": "<5.4" + }, + "require-dev": { + "symfony/console": "^5.4|^6.0|^7.0" + }, + "bin": [ + "Resources/bin/yaml-lint" + ], + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Loads and dumps YAML files", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/yaml/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:18:03+00:00" + }, + { + "name": "twig/twig", + "version": "v3.14.0", + "source": { + "type": "git", + "url": "https://github.com/twigphp/Twig.git", + "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/126b2c97818dbff0cdf3fbfc881aedb3d40aae72", + "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-ctype": "^1.8", + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-php81": "^1.29" + }, + "require-dev": { + "psr/container": "^1.0|^2.0", + "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0" + }, + "type": "library", + "autoload": { + "files": [ + "src/Resources/core.php", + "src/Resources/debug.php", + "src/Resources/escaper.php", + "src/Resources/string_loader.php" + ], + "psr-4": { + "Twig\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, + { + "name": "Twig Team", + "role": "Contributors" + }, + { + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" + } + ], + "description": "Twig, the flexible, fast, and secure template language for PHP", + "homepage": "https://twig.symfony.com", + "keywords": [ + "templating" + ], + "support": { + "issues": "https://github.com/twigphp/Twig/issues", + "source": "https://github.com/twigphp/Twig/tree/v3.14.0" + }, + "funding": [ + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/twig/twig", + "type": "tidelift" + } + ], + "time": "2024-09-09T17:55:12+00:00" + } + ], + "packages-dev": [ + { + "name": "clue/ndjson-react", + "version": "v1.3.0", + "source": { + "type": "git", + "url": "https://github.com/clue/reactphp-ndjson.git", + "reference": "392dc165fce93b5bb5c637b67e59619223c931b0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/clue/reactphp-ndjson/zipball/392dc165fce93b5bb5c637b67e59619223c931b0", + "reference": "392dc165fce93b5bb5c637b67e59619223c931b0", + "shasum": "" + }, + "require": { + "php": ">=5.3", + "react/stream": "^1.2" + }, + "require-dev": { + "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35", + "react/event-loop": "^1.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Clue\\React\\NDJson\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering" + } + ], + "description": "Streaming newline-delimited JSON (NDJSON) parser and encoder for ReactPHP.", + "homepage": "https://github.com/clue/reactphp-ndjson", + "keywords": [ + "NDJSON", + "json", + "jsonlines", + "newline", + "reactphp", + "streaming" + ], + "support": { + "issues": "https://github.com/clue/reactphp-ndjson/issues", + "source": "https://github.com/clue/reactphp-ndjson/tree/v1.3.0" + }, + "funding": [ + { + "url": "https://clue.engineering/support", + "type": "custom" + }, + { + "url": "https://github.com/clue", + "type": "github" + } + ], + "time": "2022-12-23T10:58:28+00:00" + }, + { + "name": "composer/pcre", + "version": "3.3.1", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4", + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0" + }, + "conflict": { + "phpstan/phpstan": "<1.11.10" + }, + "require-dev": { + "phpstan/phpstan": "^1.11.10", + "phpstan/phpstan-strict-rules": "^1.1", + "phpunit/phpunit": "^8 || ^9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + }, + "phpstan": { + "includes": [ + "extension.neon" + ] + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/3.3.1" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-08-27T18:44:43+00:00" + }, + { + "name": "composer/semver", + "version": "3.4.3", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git", + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.11", + "symfony/phpunit-bridge": "^3 || ^7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Semver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", + "keywords": [ + "semantic", + "semver", + "validation", + "versioning" + ], + "support": { + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/3.4.3" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-09-19T14:15:21+00:00" + }, + { + "name": "composer/xdebug-handler", + "version": "3.0.5", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef", + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef", + "shasum": "" + }, + "require": { + "composer/pcre": "^1 || ^2 || ^3", + "php": "^7.2.5 || ^8.0", + "psr/log": "^1 || ^2 || ^3" + }, + "require-dev": { + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without Xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], + "support": { + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/xdebug-handler/issues", + "source": "https://github.com/composer/xdebug-handler/tree/3.0.5" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-05-06T16:37:16+00:00" + }, + { + "name": "evenement/evenement", + "version": "v3.0.2", + "source": { + "type": "git", + "url": "https://github.com/igorw/evenement.git", + "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/igorw/evenement/zipball/0a16b0d71ab13284339abb99d9d2bd813640efbc", + "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc", + "shasum": "" + }, + "require": { + "php": ">=7.0" + }, + "require-dev": { + "phpunit/phpunit": "^9 || ^6" + }, + "type": "library", + "autoload": { + "psr-4": { + "Evenement\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + } + ], + "description": "Événement is a very simple event dispatching library for PHP", + "keywords": [ + "event-dispatcher", + "event-emitter" + ], + "support": { + "issues": "https://github.com/igorw/evenement/issues", + "source": "https://github.com/igorw/evenement/tree/v3.0.2" + }, + "time": "2023-08-08T05:53:35+00:00" + }, + { + "name": "fidry/cpu-core-counter", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/theofidry/cpu-core-counter.git", + "reference": "8520451a140d3f46ac33042715115e290cf5785f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f", + "reference": "8520451a140d3f46ac33042715115e290cf5785f", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "fidry/makefile": "^0.2.0", + "fidry/php-cs-fixer-config": "^1.1.2", + "phpstan/extension-installer": "^1.2.0", + "phpstan/phpstan": "^1.9.2", + "phpstan/phpstan-deprecation-rules": "^1.0.0", + "phpstan/phpstan-phpunit": "^1.2.2", + "phpstan/phpstan-strict-rules": "^1.4.4", + "phpunit/phpunit": "^8.5.31 || ^9.5.26", + "webmozarts/strict-phpunit": "^7.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Fidry\\CpuCoreCounter\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Théo FIDRY", + "email": "theo.fidry@gmail.com" + } + ], + "description": "Tiny utility to get the number of CPU cores.", + "keywords": [ + "CPU", + "core" + ], + "support": { + "issues": "https://github.com/theofidry/cpu-core-counter/issues", + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0" + }, + "funding": [ + { + "url": "https://github.com/theofidry", + "type": "github" + } + ], + "time": "2024-08-06T10:04:20+00:00" + }, + { + "name": "friendsofphp/php-cs-fixer", + "version": "v3.58.1", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", + "reference": "04e9424025677a86914b9a4944dbbf4060bb0aff" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/04e9424025677a86914b9a4944dbbf4060bb0aff", + "reference": "04e9424025677a86914b9a4944dbbf4060bb0aff", + "shasum": "" + }, + "require": { + "clue/ndjson-react": "^1.0", + "composer/semver": "^3.4", + "composer/xdebug-handler": "^3.0.3", + "ext-filter": "*", + "ext-json": "*", + "ext-tokenizer": "*", + "fidry/cpu-core-counter": "^1.0", + "php": "^7.4 || ^8.0", + "react/child-process": "^0.6.5", + "react/event-loop": "^1.0", + "react/promise": "^2.0 || ^3.0", + "react/socket": "^1.0", + "react/stream": "^1.0", + "sebastian/diff": "^4.0 || ^5.0 || ^6.0", + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", + "symfony/filesystem": "^5.4 || ^6.0 || ^7.0", + "symfony/finder": "^5.4 || ^6.0 || ^7.0", + "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0", + "symfony/polyfill-mbstring": "^1.28", + "symfony/polyfill-php80": "^1.28", + "symfony/polyfill-php81": "^1.28", + "symfony/process": "^5.4 || ^6.0 || ^7.0", + "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0" + }, + "require-dev": { + "facile-it/paraunit": "^1.3 || ^2.0", + "infection/infection": "^0.27.11", + "justinrainbow/json-schema": "^5.2", + "keradus/cli-executor": "^2.1", + "mikey179/vfsstream": "^1.6.11", + "php-coveralls/php-coveralls": "^2.7", + "php-cs-fixer/accessible-object": "^1.1", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4", + "phpunit/phpunit": "^9.6 || ^10.5.5 || ^11.0.2", + "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0" + }, + "suggest": { + "ext-dom": "For handling output formats in XML", + "ext-mbstring": "For handling non-UTF8 characters." + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", + "autoload": { + "psr-4": { + "PhpCsFixer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + } + ], + "description": "A tool to automatically fix PHP code style", + "keywords": [ + "Static code analysis", + "fixer", + "standards", + "static analysis" + ], + "support": { + "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.58.1" + }, + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], + "time": "2024-05-29T16:39:07+00:00" + }, + { + "name": "phpstan/phpstan", + "version": "1.12.7", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", + "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0" + }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "keywords": [ + "dev", + "static analysis" + ], + "support": { + "docs": "https://phpstan.org/user-guide/getting-started", + "forum": "https://github.com/phpstan/phpstan/discussions", + "issues": "https://github.com/phpstan/phpstan/issues", + "security": "https://github.com/phpstan/phpstan/security/policy", + "source": "https://github.com/phpstan/phpstan-src" + }, + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://github.com/phpstan", + "type": "github" + } + ], + "time": "2024-10-18T11:12:07+00:00" + }, + { + "name": "psr/container", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/2.0.2" + }, + "time": "2021-11-05T16:47:00+00:00" + }, + { + "name": "psr/event-dispatcher", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\EventDispatcher\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Standard interfaces for event handling.", + "keywords": [ + "events", + "psr", + "psr-14" + ], + "support": { + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + }, + "time": "2019-01-08T18:20:26+00:00" + }, + { + "name": "react/cache", + "version": "v1.2.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/cache.git", + "reference": "d47c472b64aa5608225f47965a484b75c7817d5b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/cache/zipball/d47c472b64aa5608225f47965a484b75c7817d5b", + "reference": "d47c472b64aa5608225f47965a484b75c7817d5b", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "react/promise": "^3.0 || ^2.0 || ^1.1" + }, + "require-dev": { + "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\Cache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "Async, Promise-based cache interface for ReactPHP", + "keywords": [ + "cache", + "caching", + "promise", + "reactphp" + ], + "support": { + "issues": "https://github.com/reactphp/cache/issues", + "source": "https://github.com/reactphp/cache/tree/v1.2.0" + }, + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2022-11-30T15:59:55+00:00" + }, + { + "name": "react/child-process", + "version": "v0.6.5", + "source": { + "type": "git", + "url": "https://github.com/reactphp/child-process.git", + "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/child-process/zipball/e71eb1aa55f057c7a4a0d08d06b0b0a484bead43", + "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43", + "shasum": "" + }, + "require": { + "evenement/evenement": "^3.0 || ^2.0 || ^1.0", + "php": ">=5.3.0", + "react/event-loop": "^1.2", + "react/stream": "^1.2" + }, + "require-dev": { + "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35", + "react/socket": "^1.8", + "sebastian/environment": "^5.0 || ^3.0 || ^2.0 || ^1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\ChildProcess\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "Event-driven library for executing child processes with ReactPHP.", + "keywords": [ + "event-driven", + "process", + "reactphp" + ], + "support": { + "issues": "https://github.com/reactphp/child-process/issues", + "source": "https://github.com/reactphp/child-process/tree/v0.6.5" + }, + "funding": [ + { + "url": "https://github.com/WyriHaximus", + "type": "github" + }, + { + "url": "https://github.com/clue", + "type": "github" + } + ], + "time": "2022-09-16T13:41:56+00:00" + }, + { + "name": "react/dns", + "version": "v1.13.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/dns.git", + "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/dns/zipball/eb8ae001b5a455665c89c1df97f6fb682f8fb0f5", + "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "react/cache": "^1.0 || ^0.6 || ^0.5", + "react/event-loop": "^1.2", + "react/promise": "^3.2 || ^2.7 || ^1.2.1" + }, + "require-dev": { + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", + "react/async": "^4.3 || ^3 || ^2", + "react/promise-timer": "^1.11" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\Dns\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "Async DNS resolver for ReactPHP", + "keywords": [ + "async", + "dns", + "dns-resolver", + "reactphp" + ], + "support": { + "issues": "https://github.com/reactphp/dns/issues", + "source": "https://github.com/reactphp/dns/tree/v1.13.0" + }, + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2024-06-13T14:18:03+00:00" + }, + { + "name": "react/event-loop", + "version": "v1.5.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/event-loop.git", + "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/event-loop/zipball/bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354", + "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" + }, + "suggest": { + "ext-pcntl": "For signal handling support when using the StreamSelectLoop" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\EventLoop\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.", + "keywords": [ + "asynchronous", + "event-loop" + ], + "support": { + "issues": "https://github.com/reactphp/event-loop/issues", + "source": "https://github.com/reactphp/event-loop/tree/v1.5.0" + }, + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2023-11-13T13:48:05+00:00" + }, + { + "name": "react/promise", + "version": "v3.2.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/promise.git", + "reference": "8a164643313c71354582dc850b42b33fa12a4b63" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63", + "reference": "8a164643313c71354582dc850b42b33fa12a4b63", + "shasum": "" + }, + "require": { + "php": ">=7.1.0" + }, + "require-dev": { + "phpstan/phpstan": "1.10.39 || 1.4.10", + "phpunit/phpunit": "^9.6 || ^7.5" + }, + "type": "library", + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "React\\Promise\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "A lightweight implementation of CommonJS Promises/A for PHP", + "keywords": [ + "promise", + "promises" + ], + "support": { + "issues": "https://github.com/reactphp/promise/issues", + "source": "https://github.com/reactphp/promise/tree/v3.2.0" + }, + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2024-05-24T10:39:05+00:00" + }, + { + "name": "react/socket", + "version": "v1.16.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/socket.git", + "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", + "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", + "shasum": "" + }, + "require": { + "evenement/evenement": "^3.0 || ^2.0 || ^1.0", + "php": ">=5.3.0", + "react/dns": "^1.13", + "react/event-loop": "^1.2", + "react/promise": "^3.2 || ^2.6 || ^1.2.1", + "react/stream": "^1.4" + }, + "require-dev": { + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", + "react/async": "^4.3 || ^3.3 || ^2", + "react/promise-stream": "^1.4", + "react/promise-timer": "^1.11" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\Socket\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP", + "keywords": [ + "Connection", + "Socket", + "async", + "reactphp", + "stream" + ], + "support": { + "issues": "https://github.com/reactphp/socket/issues", + "source": "https://github.com/reactphp/socket/tree/v1.16.0" + }, + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2024-07-26T10:38:09+00:00" + }, + { + "name": "react/stream", + "version": "v1.4.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/stream.git", + "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d", + "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d", + "shasum": "" + }, + "require": { + "evenement/evenement": "^3.0 || ^2.0 || ^1.0", + "php": ">=5.3.8", + "react/event-loop": "^1.2" + }, + "require-dev": { + "clue/stream-filter": "~1.2", + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\Stream\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP", + "keywords": [ + "event-driven", + "io", + "non-blocking", + "pipe", + "reactphp", + "readable", + "stream", + "writable" + ], + "support": { + "issues": "https://github.com/reactphp/stream/issues", + "source": "https://github.com/reactphp/stream/tree/v1.4.0" + }, + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2024-06-11T12:45:25+00:00" + }, + { + "name": "sebastian/diff", + "version": "5.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e", + "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0", + "symfony/process": "^6.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "5.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff", + "udiff", + "unidiff", + "unified diff" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "security": "https://github.com/sebastianbergmann/diff/security/policy", + "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-02T07:15:17+00:00" + }, + { + "name": "symfony/console", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "f793dd5a7d9ae9923e35d0503d08ba734cec1d79" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/f793dd5a7d9ae9923e35d0503d08ba734cec1d79", + "reference": "f793dd5a7d9ae9923e35d0503d08ba734cec1d79", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/string": "^5.4|^6.0|^7.0" + }, + "conflict": { + "symfony/dependency-injection": "<5.4", + "symfony/dotenv": "<5.4", + "symfony/event-dispatcher": "<5.4", + "symfony/lock": "<5.4", + "symfony/process": "<5.4" + }, + "provide": { + "psr/log-implementation": "1.0|2.0|3.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Eases the creation of beautiful and testable command line interfaces", + "homepage": "https://symfony.com", + "keywords": [ + "cli", + "command-line", + "console", + "terminal" + ], + "support": { + "source": "https://github.com/symfony/console/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-10-09T08:40:40+00:00" + }, + { + "name": "symfony/event-dispatcher", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", + "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/event-dispatcher-contracts": "^2.5|^3" + }, + "conflict": { + "symfony/dependency-injection": "<5.4", + "symfony/service-contracts": "<2.5" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "2.0|3.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/stopwatch": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:18:03+00:00" + }, + { + "name": "symfony/event-dispatcher-contracts", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50", + "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/event-dispatcher": "^1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\EventDispatcher\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to dispatching event", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:32:20+00:00" + }, + { + "name": "symfony/filesystem", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/4856c9cf585d5a0313d8d35afd681a526f038dd3", + "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8" + }, + "require-dev": { + "symfony/process": "^5.4|^6.4|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides basic utilities for the filesystem", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-10-25T15:07:50+00:00" + }, + { + "name": "symfony/finder", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/daea9eca0b08d0ed1dc9ab702a46128fd1be4958", + "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "symfony/filesystem": "^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Finds files and directories via an intuitive fluent interface", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/finder/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-10-01T08:30:56+00:00" + }, + { + "name": "symfony/options-resolver", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/options-resolver.git", + "reference": "0a62a9f2504a8dd27083f89d21894ceb01cc59db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0a62a9f2504a8dd27083f89d21894ceb01cc59db", + "reference": "0a62a9f2504a8dd27083f89d21894ceb01cc59db", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an improved replacement for the array_replace PHP function", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "support": { + "source": "https://github.com/symfony/options-resolver/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:18:03+00:00" + }, + { + "name": "symfony/polyfill-intl-grapheme", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's grapheme_* functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "grapheme", + "intl", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "3833d7255cc303546435cb650316bff708a1c75c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/process", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "1f9f59b46880201629df3bd950fc5ae8c55b960f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/1f9f59b46880201629df3bd950fc5ae8c55b960f", + "reference": "1f9f59b46880201629df3bd950fc5ae8c55b960f", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Executes commands in sub-processes", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/process/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:18:03+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3" + }, + "conflict": { + "ext-psr": "<1.1|>=2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:32:20+00:00" + }, + { + "name": "symfony/stopwatch", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "2cae0a6f8d04937d02f6d19806251e2104d54f92" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/2cae0a6f8d04937d02f6d19806251e2104d54f92", + "reference": "2cae0a6f8d04937d02f6d19806251e2104d54f92", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/service-contracts": "^2.5|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a way to profile code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/stopwatch/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:18:03+00:00" + }, + { + "name": "symfony/string", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/string.git", + "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/string/zipball/38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", + "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/translation-contracts": "<2.5" + }, + "require-dev": { + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/intl": "^6.2|^7.0", + "symfony/translation-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "files": [ + "Resources/functions.php" + ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "homepage": "https://symfony.com", + "keywords": [ + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" + ], + "support": { + "source": "https://github.com/symfony/string/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:18:03+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": {}, + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": "^8.1", + "ext-dom": "*", + "ext-openssl": "*", + "ext-pdo": "*", + "ext-zlib": "*" + }, + "platform-dev": {}, + "plugin-api-version": "2.6.0" +} diff --git a/pkgs/by-name/ba/baikal/package.nix b/pkgs/by-name/ba/baikal/package.nix new file mode 100644 index 000000000000..fcdff1452489 --- /dev/null +++ b/pkgs/by-name/ba/baikal/package.nix @@ -0,0 +1,25 @@ +{ + php, + fetchFromGitHub, + lib, +}: +php.buildComposerProject rec { + pname = "baikal"; + version = "0.10.1"; + src = fetchFromGitHub { + owner = "sabre-io"; + repo = "Baikal"; + tag = version; + hash = "sha256-YQQwTdwfHQZdUhO5HbScj/Bl8ype7TtPI3lHjvz2k04="; + }; + # It doesn't provide a composer.lock file, we have to generate manually. + composerLock = ./composer.lock; + vendorHash = "sha256-R9DlgrULUJ02wBOGIdOQrcKiATSSZ/UApYODQ8485Qs="; + + meta = { + description = "Lightweight CalDAV+CardDAV server that offers an extensive web interface with easy management of users, address books and calendars"; + homepage = "https://sabre.io/baikal/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ wrvsrx ]; + }; +} From 04520fadfc23c177beb177504aa6a0267ca59a4e Mon Sep 17 00:00:00 2001 From: Haylin Moore Date: Sat, 5 Apr 2025 19:39:09 -0400 Subject: [PATCH 022/240] html-minifier: remove dangling symlinks --- pkgs/by-name/ht/html-minifier/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ht/html-minifier/package.nix b/pkgs/by-name/ht/html-minifier/package.nix index 81bf3e65fdf8..45d4e247bebb 100644 --- a/pkgs/by-name/ht/html-minifier/package.nix +++ b/pkgs/by-name/ht/html-minifier/package.nix @@ -19,6 +19,10 @@ buildNpmPackage rec { npmFlags = [ "--ignore-scripts" ]; + postInstall = '' + find $out/lib/node_modules -xtype l -delete + ''; + dontNpmBuild = true; meta = { From 30348fd24e823e94c9845c61b4a9f68b63e4d687 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 6 Apr 2025 13:05:22 +0800 Subject: [PATCH 023/240] anvil-editor: 0.4 -> 0.6 --- pkgs/by-name/an/anvil-editor/extras.nix | 14 ---------- pkgs/by-name/an/anvil-editor/package.nix | 34 +++++++++++++----------- 2 files changed, 19 insertions(+), 29 deletions(-) delete mode 100644 pkgs/by-name/an/anvil-editor/extras.nix diff --git a/pkgs/by-name/an/anvil-editor/extras.nix b/pkgs/by-name/an/anvil-editor/extras.nix deleted file mode 100644 index 4e130565fe4c..000000000000 --- a/pkgs/by-name/an/anvil-editor/extras.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - buildGoModule, - anvil-editor, -}: - -buildGoModule { - inherit (anvil-editor) version src meta; - - pname = "anvil-editor-extras"; - - modRoot = "anvil-extras"; - - vendorHash = "sha256-PH7HSMlCAHn4L1inJDbDcj6n+i6LXakIOqwdUkRjf9E="; -} diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix index 2466eb283aa0..918554209356 100644 --- a/pkgs/by-name/an/anvil-editor/package.nix +++ b/pkgs/by-name/an/anvil-editor/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - buildGoModule, + buildGo123Module, fetchzip, pkg-config, copyDesktopItems, @@ -12,26 +12,31 @@ vulkan-headers, libGL, xorg, - callPackage, buildPackages, - anvilExtras ? callPackage ./extras.nix { }, }: -buildGoModule rec { +buildGo123Module (finalAttrs: { pname = "anvil-editor"; - version = "0.4"; + version = "0.6"; # has to update vendorHash of extra package manually # nixpkgs-update: no auto update src = fetchzip { - url = "https://anvil-editor.net/releases/anvil-src-v${version}.tar.gz"; - hash = "sha256-0fi6UeppWC9KbWibjQYlPlRqsl9xsvij8YpJUS0S/wY="; + url = "https://anvil-editor.net/releases/anvil-src-v${finalAttrs.version}.tar.gz"; + hash = "sha256-i0S5V3j6OPpu4z1ljDKP3WYa9L+EKwo/MBNgW2ENYk8="; }; modRoot = "anvil/src/anvil"; vendorHash = "sha256-1oFBV7D7JgOt5yYAxVvC4vL4ccFv3JrNngZbo+5pzrk="; + anvilExtras = buildGo123Module { + pname = "anvil-editor-extras"; + inherit (finalAttrs) version src meta; + vendorHash = "sha256-4pfk5XuwDbCWFZIF+1l+dy8NfnGNjgHmSg9y6/RnTSo="; + modRoot = "anvil-extras"; + }; + nativeBuildInputs = [ pkg-config @@ -60,8 +65,11 @@ buildGoModule rec { exec = "anvil"; icon = "anvil"; desktopName = "Anvil"; - comment = meta.description; - categories = [ "TextEditor" ]; + comment = finalAttrs.meta.description; + categories = [ + "Utility" + "TextEditor" + ]; startupWMClass = "anvil"; }) ]; @@ -76,13 +84,9 @@ buildGoModule rec { install -Dm644 anvil_''${square}x32.png $out/share/icons/hicolor/''${square}/apps/anvil.png done popd - cp ${anvilExtras}/bin/* $out/bin + cp ${finalAttrs.anvilExtras}/bin/* $out/bin ''; - passthru = { - inherit anvilExtras; - }; - meta = { description = "Graphical, multi-pane tiling editor inspired by Acme"; homepage = "https://anvil-editor.net"; @@ -91,4 +95,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ aleksana ]; platforms = with lib.platforms; unix ++ windows; }; -} +}) From d55b9c97cc34eb4b3e8f2f8d508ab4ee8a817fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 6 Apr 2025 21:46:27 -0700 Subject: [PATCH 024/240] bitwarden-cli: 2025.2.0 -> 2025.3.0 Diff: https://github.com/bitwarden/clients/compare/refs/tags/cli-v2025.2.0...2025.3.0 Changelog: https://github.com/bitwarden/clients/releases/tag/cli-v2025.3.0 --- pkgs/by-name/bi/bitwarden-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 9f7da212c2c1..f978f93de241 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -13,13 +13,13 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2025.2.0"; + version = "2025.3.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; tag = "cli-v${version}"; - hash = "sha256-Ls30yeqMDBA4HjQdnICJy0HVHm7VfZarsKUHn3KTatA="; + hash = "sha256-SFwDyff3BHx0QKQZbhESUvjPT906/HGxGr1bA0PAvTQ="; }; postPatch = '' @@ -29,7 +29,7 @@ buildNpmPackage rec { nodejs = nodejs_20; - npmDepsHash = "sha256-V77I2ZzmcCo06vq76lGkRa+NmTEUe2urD0D1HQ/gBJA="; + npmDepsHash = "sha256-8sHagqyDqdGtY8IIOPq8hGYUdnkChR94wK4OWeuAgbc="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools From 2426aaa7c59b32ca125582a4b5676824f60b72e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Apr 2025 09:17:22 +0000 Subject: [PATCH 025/240] cargo-expand: 1.0.104 -> 1.0.106 --- pkgs/by-name/ca/cargo-expand/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index bdf13f371b85..33a053d1e725 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.104"; + version = "1.0.106"; src = fetchFromGitHub { owner = "dtolnay"; repo = "cargo-expand"; rev = version; - hash = "sha256-PSiuTw3H3vl4Tnts5eOTd1v8SLPvYZCkuQ/pTSa3O18="; + hash = "sha256-7j8i0wvbbAFPNgHamy+lybQpz1ht+n90oidVGSXP6MA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-apFOBEao2DKsdjdth+vGzzRa9Mw7fTb/88TetY0vp6E="; + cargoHash = "sha256-e6K97VUsCYx56Y9r7QPVBV3eMwWnjEhZoEKpmuKmkJk="; meta = with lib; { description = "Cargo subcommand to show result of macro expansion"; From be0d4cf7207c26f9b93078148657cef3333d52ba Mon Sep 17 00:00:00 2001 From: Tanya Date: Tue, 8 Apr 2025 00:16:54 +0530 Subject: [PATCH 026/240] tpnote: 1.25.6 -> 1.25.7 --- pkgs/by-name/tp/tpnote/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index 30ed1b44393a..0a46eeb6575e 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "tpnote"; - version = "1.25.6"; + version = "1.25.7"; src = fetchFromGitHub { owner = "getreu"; repo = "tp-note"; tag = "v${version}"; - hash = "sha256-9mj88mUCpMPBIUrwAL61/XAtn3OQ3EtdP8ZlQBHE4/I="; + hash = "sha256-lTUS3sAMq5FPxC8Moi6a+S71XtG+9AlBTO/cDVTrncM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-K/vtA6Gr015xwuJBge+QDW3MQMJNyKyfxtkV6fs/zmE="; + cargoHash = "sha256-3oallbuiRrBDAWsIl8vGz3xbjPIb5ceBmQsNHVOWbTE="; nativeBuildInputs = [ cmake From ce09231d904a8366d33689bc35376ee31f6b1fdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Apr 2025 18:51:23 +0000 Subject: [PATCH 027/240] sundials: 7.2.1 -> 7.3.0 --- pkgs/development/libraries/sundials/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index d06696d71709..c02d10409b6f 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "7.2.1"; + version = "7.3.0"; outputs = [ "out" @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz"; - hash = "sha256-N4Hj983zcsoS9/vmT1Yai5pQe4qLLE1s4o2OTfS+++o="; + hash = "sha256-/ZcKkCP46je4HFBlwGe/Fyb2VrOfWQe0gWmm+Y0wa6c="; }; nativeBuildInputs = [ From 460cbc8c6cf0c11cc849e719c90ff9000ae9ed3c Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 7 Apr 2025 21:51:59 +0300 Subject: [PATCH 028/240] prefetch-yarn-deps: don't explicitly depend on nixForLinking See: https://github.com/NixOS/nixpkgs/pull/395147 --- pkgs/build-support/node/fetch-yarn-deps/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/build-support/node/fetch-yarn-deps/default.nix b/pkgs/build-support/node/fetch-yarn-deps/default.nix index 11497db66ecb..16cdee665d0d 100644 --- a/pkgs/build-support/node/fetch-yarn-deps/default.nix +++ b/pkgs/build-support/node/fetch-yarn-deps/default.nix @@ -18,7 +18,6 @@ makeSetupHook, cacert, callPackage, - nixForLinking, }: let @@ -55,7 +54,6 @@ in lib.makeBinPath [ coreutils nix-prefetch-git - nixForLinking ] } From 46a0f9f9004b216c225a1ec58fb22d5fa5f90469 Mon Sep 17 00:00:00 2001 From: Nicolas Goudry Date: Tue, 1 Apr 2025 17:43:24 +0200 Subject: [PATCH 029/240] sou: init at 0.2.0 --- pkgs/by-name/so/sou/package.nix | 44 +++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/so/sou/package.nix diff --git a/pkgs/by-name/so/sou/package.nix b/pkgs/by-name/so/sou/package.nix new file mode 100644 index 000000000000..0ee536e93a07 --- /dev/null +++ b/pkgs/by-name/so/sou/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "sou"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "knqyf263"; + repo = "sou"; + tag = "v${finalAttrs.version}"; + hash = "sha256-uGYCmW60OvEfserujQMXC9r8S8W+EN+w9EXUGjk1vtw="; + }; + + vendorHash = "sha256-6kgiZx/g1PA7R50z7noG+ql+S9wSgTuVTkY5DIqeJHY="; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${finalAttrs.version}" + ]; + + doInstallCheck = true; + nativeInstallCheck = [ versionCheckHook ]; + + # Some of the tests use localhost networking + __darwinAllowLocalNetworking = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool for exploring files in container image layers"; + homepage = "https://github.com/knqyf263/sou"; + changelog = "https://github.com/knqyf263/sou/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nicolas-goudry ]; + mainProgram = "sou"; + }; +}) From 69f4b7cdd6f16919707bfcfa5fa87ac4ec1c336b Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Tue, 4 Mar 2025 21:12:09 +0100 Subject: [PATCH 030/240] python3Packages.gnucash: Build from existing gnucash package --- pkgs/by-name/gn/gnucash/package.nix | 26 +++++++++++++++++++++++++- pkgs/top-level/python-packages.nix | 5 +++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix index 1a5d5db37261..729e78ccb5a7 100644 --- a/pkgs/by-name/gn/gnucash/package.nix +++ b/pkgs/by-name/gn/gnucash/package.nix @@ -25,8 +25,12 @@ swig, webkitgtk_4_0, wrapGAppsHook3, + python ? null, + enablePython ? false, }: +assert enablePython -> (python != null); + stdenv.mkDerivation rec { pname = "gnucash"; version = "5.11"; @@ -45,6 +49,11 @@ stdenv.mkDerivation rec { pkg-config ]; + cmakeFlags = lib.optional enablePython [ + "-DWITH_PYTHON=\"ON\"" + "-DPYTHON_SYSCONFIG_BUILD=\"$out\"" + ]; + buildInputs = [ aqbanking @@ -68,7 +77,8 @@ stdenv.mkDerivation rec { JSONParse FinanceQuote perl - ]); + ]) + ++ lib.optional enablePython python; patches = [ # this patch disables test-gnc-timezone and test-gnc-datetime which fail due to nix datetime challenges @@ -81,6 +91,20 @@ stdenv.mkDerivation rec { ./0004-exec-fq-wrapper.patch ]; + postPatch = '' + patch -p0 <>> from gnucash import thingy + END_PATCH + ''; + # this needs to be an environment variable and not a cmake flag to suppress # guile warning env.GUILE_AUTO_COMPILE = "0"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 576b55104641..aec660de7c84 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5605,6 +5605,11 @@ self: super: with self; { gntp = callPackage ../development/python-modules/gntp { }; + gnucash = toPythonModule (pkgs.gnucash.override { + inherit (self) python; + enablePython = true; + }); + gnureadline = callPackage ../development/python-modules/gnureadline { }; go2rtc-client = callPackage ../development/python-modules/go2rtc-client { }; From 6fa392fa43195cd108e419ac49f5e701fdb528c2 Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Sun, 16 Mar 2025 16:52:09 +0100 Subject: [PATCH 031/240] gnucash: Enable python bindings by default --- pkgs/by-name/gn/gnucash/package.nix | 11 ++++------- pkgs/top-level/python-packages.nix | 9 +++++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix index 729e78ccb5a7..ab5632cf143b 100644 --- a/pkgs/by-name/gn/gnucash/package.nix +++ b/pkgs/by-name/gn/gnucash/package.nix @@ -25,12 +25,9 @@ swig, webkitgtk_4_0, wrapGAppsHook3, - python ? null, - enablePython ? false, + python3, }: -assert enablePython -> (python != null); - stdenv.mkDerivation rec { pname = "gnucash"; version = "5.11"; @@ -49,7 +46,7 @@ stdenv.mkDerivation rec { pkg-config ]; - cmakeFlags = lib.optional enablePython [ + cmakeFlags = [ "-DWITH_PYTHON=\"ON\"" "-DPYTHON_SYSCONFIG_BUILD=\"$out\"" ]; @@ -72,13 +69,13 @@ stdenv.mkDerivation rec { libxslt swig webkitgtk_4_0 + python3 ] ++ (with perlPackages; [ JSONParse FinanceQuote perl - ]) - ++ lib.optional enablePython python; + ]); patches = [ # this patch disables test-gnc-timezone and test-gnc-datetime which fail due to nix datetime challenges diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aec660de7c84..3772c02a52e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5605,10 +5605,11 @@ self: super: with self; { gntp = callPackage ../development/python-modules/gntp { }; - gnucash = toPythonModule (pkgs.gnucash.override { - inherit (self) python; - enablePython = true; - }); + gnucash = toPythonModule ( + pkgs.gnucash.override { + python3 = python; + } + ); gnureadline = callPackage ../development/python-modules/gnureadline { }; From c191828d588b2aed59da8179388a37c5b4cef6f4 Mon Sep 17 00:00:00 2001 From: emaryn <197520219+emaryn@users.noreply.github.com> Date: Mon, 7 Apr 2025 21:17:09 +0000 Subject: [PATCH 032/240] protonup-qt: refactor --- .../applications/misc/protonup-qt/default.nix | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/applications/misc/protonup-qt/default.nix index ac0fd3ad52f3..2034a0f939af 100644 --- a/pkgs/applications/misc/protonup-qt/default.nix +++ b/pkgs/applications/misc/protonup-qt/default.nix @@ -1,39 +1,45 @@ { + lib, appimageTools, fetchurl, - lib, + makeWrapper, }: -let + +appimageTools.wrapAppImage rec { pname = "protonup-qt"; version = "2.12.0"; - src = fetchurl { - url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage"; - hash = "sha256-8MeHSy3XW1oXAD2xrDSIB0ZLJxtk5UBIMpDRTPF9ksU="; + + src = appimageTools.extractType2 { + inherit pname version; + src = fetchurl { + url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage"; + hash = "sha256-8MeHSy3XW1oXAD2xrDSIB0ZLJxtk5UBIMpDRTPF9ksU="; + }; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; + + nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = '' - mkdir -p $out/share/{applications,pixmaps} - cp ${appimageContents}/net.davidotek.pupgui2.desktop $out/share/applications/${pname}.desktop - cp ${appimageContents}/net.davidotek.pupgui2.png $out/share/pixmaps/${pname}.png - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=net.davidotek.pupgui2' 'Exec=${pname}' \ - --replace 'Icon=net.davidotek.pupgui2' 'Icon=${pname}' + install -Dm644 ${src}/net.davidotek.pupgui2.desktop $out/share/applications/protonup-qt.desktop + install -Dm644 ${src}/net.davidotek.pupgui2.png $out/share/pixmaps/protonup-qt.png + substituteInPlace $out/share/applications/protonup-qt.desktop \ + --replace-fail "Exec=net.davidotek.pupgui2" "Exec=protonup-qt" \ + --replace-fail "Icon=net.davidotek.pupgui2" "Icon=protonup-qt" + wrapProgram $out/bin/protonup-qt \ + --unset QT_PLUGIN_PATH \ + --unset QML2_IMPORT_PATH ''; extraPkgs = pkgs: with pkgs; [ zstd ]; - meta = with lib; { + meta = { homepage = "https://davidotek.github.io/protonup-qt/"; description = "Install and manage Proton-GE and Luxtorpeda for Steam and Wine-GE for Lutris with this graphical user interface"; - license = licenses.gpl3; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.gpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; mainProgram = "protonup-qt"; changelog = "https://github.com/DavidoTek/ProtonUp-Qt/releases/tag/v${version}"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ michaelBelsanti ]; + maintainers = with lib.maintainers; [ michaelBelsanti ]; }; } From af52943bd3467b33d0c500a77c86847e87c6fb39 Mon Sep 17 00:00:00 2001 From: emaryn <197520219+emaryn@users.noreply.github.com> Date: Mon, 7 Apr 2025 22:02:38 +0000 Subject: [PATCH 033/240] protonup-qt: move to by-name --- .../default.nix => by-name/pr/protonup-qt/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/protonup-qt/default.nix => by-name/pr/protonup-qt/package.nix} (100%) diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/by-name/pr/protonup-qt/package.nix similarity index 100% rename from pkgs/applications/misc/protonup-qt/default.nix rename to pkgs/by-name/pr/protonup-qt/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bb21e64bf6d..b814a369a58a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14766,8 +14766,6 @@ with pkgs; pixinsight = qt6Packages.callPackage ../applications/graphics/pixinsight { }; - protonup-qt = python3Packages.callPackage ../applications/misc/protonup-qt { }; - inherit (callPackage ../applications/virtualization/singularity/packages.nix { }) apptainer singularity From 5e43e13598fdf2581f66ac13b08cdc8b07b6e75e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Apr 2025 00:43:05 +0000 Subject: [PATCH 034/240] ants: 2.5.4 -> 2.6.0 --- pkgs/applications/science/biology/ants/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index fabcfbd708dd..f0492ad07fe8 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ANTs"; - version = "2.5.4"; + version = "2.6.0"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; tag = "v${finalAttrs.version}"; - hash = "sha256-7df9RcZZwfSkokG8dMQg65bCOk2atDGkJpPo8SrRrfY="; + hash = "sha256-3k9EOylOAUwxBNpzi6U/XZGarCZlbh9PdecKyJh81Yk="; }; nativeBuildInputs = [ From 272c66c1dd00e9a5348b88875e0ad025c8848050 Mon Sep 17 00:00:00 2001 From: BirdeeHub Date: Mon, 7 Apr 2025 19:56:11 -0700 Subject: [PATCH 035/240] vimPlugins.lze: 0.11.0 -> 0.11.1 --- pkgs/development/lua-modules/generated-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index ac310bb2e652..ee881ae10d02 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -3564,15 +3564,15 @@ final: prev: { }: buildLuarocksPackage { pname = "lze"; - version = "0.11.0-1"; + version = "0.11.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lze-0.11.0-1.rockspec"; - sha256 = "05465ndcfvvyvvxz8h7xm9vrcfbfhvs6sbrcy73cl5s44r46ym00"; + url = "mirror://luarocks/lze-0.11.1-1.rockspec"; + sha256 = "1wikzksjz7nqshnc6pbdaq5yfa4cxc5kh06shvahfxxwz2n3q7i4"; }).outPath; src = fetchzip { - url = "https://github.com/BirdeeHub/lze/archive/v0.11.0.zip"; - sha256 = "1awqix5xx4pkv09gba5xwv67qyi2qzf9aji48bk2xr431vshz5jv"; + url = "https://github.com/BirdeeHub/lze/archive/v0.11.1.zip"; + sha256 = "14lx8addmi1zr57141gvwlv0i7rgachybfynmmw8bqkadhwaz470"; }; disabled = luaOlder "5.1"; From 4fab0561c6e4ba4aba02575d4616f9d500b03f8e Mon Sep 17 00:00:00 2001 From: BirdeeHub Date: Mon, 7 Apr 2025 20:04:35 -0700 Subject: [PATCH 036/240] vimPlugins.lzextras: 0.3.0 -> 0.4.0 --- pkgs/development/lua-modules/generated-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index ac310bb2e652..0ce090b6b24e 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -3595,15 +3595,15 @@ final: prev: { }: buildLuarocksPackage { pname = "lzextras"; - version = "0.3.0-1"; + version = "0.4.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lzextras-0.3.0-1.rockspec"; - sha256 = "1w8ar8qi1hnbnj70f3lhrzf0hp1d0jbvya9v318pqcd16wh7x6ii"; + url = "mirror://luarocks/lzextras-0.4.0-1.rockspec"; + sha256 = "12s4jy3xqzb1dcan0gmgza6c9wyh44h348f4m3zzj29icffx4vyv"; }).outPath; src = fetchzip { - url = "https://github.com/BirdeeHub/lzextras/archive/v0.3.0.zip"; - sha256 = "0942wnlk7cf74z2ni3dhv2zm8ld4nazs9ciaql00vvbswh4a9z2w"; + url = "https://github.com/BirdeeHub/lzextras/archive/v0.4.0.zip"; + sha256 = "1c92vm5q9vrr1imc3h9z9vvpkhlayywgk1n3wfkqbfi37ni066kw"; }; disabled = luaOlder "5.1"; From 201693ca7a6843b6da223c070c5fb5eaf5738227 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Apr 2025 03:53:52 +0000 Subject: [PATCH 037/240] miracle-wm: 0.5.1 -> 0.5.2 --- pkgs/by-name/mi/miracle-wm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index 2ffbc30cc5f0..7763154211fa 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "miracle-wm-org"; repo = "miracle-wm"; tag = "v${finalAttrs.version}"; - hash = "sha256-PCY6vAnDjyoIL66oREUGRypQFX90EKB1RlXTkQDyXMw="; + hash = "sha256-nmDFmj3DawgjRB0+vlcvPX+kj6lzAu14HySFc2NsJss="; }; postPatch = From ce4b0e657ec589f8fdb42c5e7219da8cd31197be Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 8 Apr 2025 06:26:01 +0100 Subject: [PATCH 038/240] apacheKafka.tests: fix the eval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change the eval fails as: $ nix build --no-link -f. apacheKafka.tests error: … while evaluating the attribute 'nixos' at pkgs/servers/apache-kafka/default.nix:94:9: 93| inherit (versionInfo) jre; # Used by the NixOS module to select the supported JRE 94| tests.nixos = versionInfo.nixosTest; | ^ 95| }; … while evaluating the attribute 'nixosTest' at pkgs/servers/apache-kafka/default.nix:22:7: 21| jre = jdk17_headless; 22| nixosTest = nixosTests.kafka.kafka_4_0; | ^ 23| }; (stack trace truncated; use '--show-trace' to show the full, detailed trace) error: attribute 'kafka_4_0' missing at pkgs/servers/apache-kafka/default.nix:22:19: 21| jre = jdk17_headless; 22| nixosTest = nixosTests.kafka.kafka_4_0; | ^ 23| }; --- pkgs/servers/apache-kafka/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index a6d3d72c9f3f..71e3e6c97e1e 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -19,28 +19,28 @@ let scalaVersion = "2.13"; sha256 = "sha256-e4Uuk4vAneEM2W7KN1UljH0l+4nb3XYwVxdgfhg14qo="; jre = jdk17_headless; - nixosTest = nixosTests.kafka.kafka_4_0; + nixosTest = nixosTests.kafka.base.kafka_4_0; }; "3_9" = { kafkaVersion = "3.9.0"; scalaVersion = "2.13"; sha256 = "sha256-q8REAt3xA+OPGbDktE5l2pqDG6nlj9dyUEGxqhaO6NE="; jre = jdk17_headless; - nixosTest = nixosTests.kafka.kafka_3_9; + nixosTest = nixosTests.kafka.base.kafka_3_9; }; "3_8" = { kafkaVersion = "3.8.1"; scalaVersion = "2.13"; sha256 = "sha256-IhdChtYMqmKyVQbEhpRLxuBNjLLS8VCD0v60gjl3i2I="; jre = jdk17_headless; - nixosTest = nixosTests.kafka.kafka_3_8; + nixosTest = nixosTests.kafka.base.kafka_3_8; }; "3_7" = { kafkaVersion = "3.7.1"; scalaVersion = "2.13"; sha256 = "sha256-YqyuShQ92YPcfrSATVdEugxQsZm1CPWZ7wAQIOJVj8k="; jre = jdk17_headless; - nixosTest = nixosTests.kafka.kafka_3_7; + nixosTest = nixosTests.kafka.base.kafka_3_7; }; }; From 7d55c1b7fc4e2179f6476cbb719935564b6bd8f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Apr 2025 06:24:35 +0000 Subject: [PATCH 039/240] fanficfare: 4.43.0 -> 4.44.0 --- pkgs/by-name/fa/fanficfare/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fanficfare/package.nix b/pkgs/by-name/fa/fanficfare/package.nix index 3b9290e1bb51..5593fbf59678 100644 --- a/pkgs/by-name/fa/fanficfare/package.nix +++ b/pkgs/by-name/fa/fanficfare/package.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "fanficfare"; - version = "4.43.0"; + version = "4.44.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-uaYMmb896gJ31nbcGJs42jlSpvHUTvpLlD00r1icXRY="; + hash = "sha256-3+2T3qUk9tbQD+GxM2S+iDWNlKE+f3GplBoYIJGAJKE="; }; nativeBuildInputs = with python3Packages; [ From 9e3064456be83d8ab772d9380e7ce445b7d534f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Apr 2025 07:23:11 +0000 Subject: [PATCH 040/240] zircolite: 2.30.1 -> 2.40.0 --- pkgs/by-name/zi/zircolite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zi/zircolite/package.nix b/pkgs/by-name/zi/zircolite/package.nix index ba0623617869..687126aa0187 100644 --- a/pkgs/by-name/zi/zircolite/package.nix +++ b/pkgs/by-name/zi/zircolite/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "zircolite"; - version = "2.30.1"; + version = "2.40.0"; format = "other"; src = fetchFromGitHub { owner = "wagga40"; repo = "Zircolite"; tag = version; - hash = "sha256-9stQa0EMNA/qEN+bU7qBOdcwUR1vMGk70Br6wxRK8cs="; + hash = "sha256-11jNd7Ids2aB+R+Hv6n8Wfm2hDuKCxC0EMZSBWJfDos="; }; __darwinAllowLocalNetworking = true; @@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication rec { description = "SIGMA-based detection tool for EVTX, Auditd, Sysmon and other logs"; mainProgram = "zircolite"; homepage = "https://github.com/wagga40/Zircolite"; - changelog = "https://github.com/wagga40/Zircolite/releases/tag/${version}"; + changelog = "https://github.com/wagga40/Zircolite/releases/tag/${src.tag}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; From 1c10880b330bf7f791dd70bf4cd59c93f402bf45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Apr 2025 09:33:29 +0000 Subject: [PATCH 041/240] cloudflare-warp: 2025.1.861 -> 2025.2.600 --- pkgs/by-name/cl/cloudflare-warp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index 5e0d544ad51a..2ec69044edfa 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -23,15 +23,15 @@ }: let - version = "2025.1.861"; + version = "2025.2.600"; sources = { x86_64-linux = fetchurl { url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_amd64.deb"; - hash = "sha256-9Y1mBKS74x1F3OEusqvm7W8RoJnfBHnXTtwbFVfhjc4="; + hash = "sha256-YY80XGTkKqE5pywuidvXPytv0/uMD4eMIcBlSpEV2Ps="; }; aarch64-linux = fetchurl { url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_arm64.deb"; - hash = "sha256-WM9c17t5rJDdGeMP17k/eZx4knLHd+MbkleIF1mNA4A="; + hash = "sha256-ueZL0rX1FCkd7jFpM2c63eu11vFBCUVnl1uOGxPClZU="; }; }; in From 6536fe5c55c2d023ce874e6a47e0f7ccf3c5f053 Mon Sep 17 00:00:00 2001 From: kilianar Date: Mon, 24 Mar 2025 11:43:47 +0100 Subject: [PATCH 042/240] stellarium: 24.4 -> 25.1 https://github.com/Stellarium/stellarium/releases/tag/v25.1 --- .../science/astronomy/stellarium/default.nix | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 1c41f924b898..2694f9ab05da 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, perl, wrapGAppsHook3, @@ -24,34 +23,33 @@ testers, xvfb-run, gitUpdater, + md4c, }: stdenv.mkDerivation (finalAttrs: { pname = "stellarium"; - version = "24.4"; + version = "25.1"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${finalAttrs.version}"; - hash = "sha256-/xF9hXlPKhmpvpx9t1IgSqpvvqrGnd0xaf0QMvu+9IA="; + hash = "sha256-rbnGSdzPuFdSqWPaKtF3n4oLZ9l+4jX7KtnmcrTvwbs="; }; - patches = [ - # Fix indi headers from https://github.com/Stellarium/stellarium/pull/4025 - (fetchpatch { - url = "https://github.com/Stellarium/stellarium/commit/9669d64fb4104830412c6c6c2b45811075a92300.patch"; - hash = "sha256-CXeghxxRIV7Filveg+3pNAWymUpUuGnylvt4e8THJ8A="; - }) - ]; - - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace CMakeLists.txt \ - --replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \ - 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")' - substituteInPlace src/CMakeLists.txt \ - --replace "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/" - ''; + postPatch = + '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'CPMAddPackage(NAME md4c' \ + 'CPMFindPackage(NAME md4c' + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \ + 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")' + substituteInPlace src/CMakeLists.txt \ + --replace-fail "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/" + ''; nativeBuildInputs = [ cmake @@ -74,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: { indilib libnova exiv2 + md4c nlopt ] ++ lib.optionals stdenv.hostPlatform.isLinux [ From 37e3374ebc6b76c6684c8e81e4e2928b57b4a4f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Apr 2025 11:39:24 +0000 Subject: [PATCH 043/240] pscale: 0.230.0 -> 0.236.0 --- pkgs/by-name/ps/pscale/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index ffbd140a6627..2fc8cc93982b 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.230.0"; + version = "0.236.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-aWml3iTcci1V8RkiCrvv+E7zmW5JJCDzDNv2RaDhjAg="; + sha256 = "sha256-sL/TBcUtHYqZuUp5JlcKshwlyVSf0t0XukMmRkWRyvk="; }; - vendorHash = "sha256-soDM7IfgTKWZnFNfGSlKH4aScGr1A26OZrgqiJ5UAlA="; + vendorHash = "sha256-Uw4A6RBq0OiBHWRfmj9wKI2FenDN6C8CWEsKicGS/1Q="; ldflags = [ "-s" From 771c552508d250cb54f385c39c6e721dfc76693c Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Tue, 8 Apr 2025 09:56:55 -0300 Subject: [PATCH 044/240] planarity: 3.0.2.0 -> 4.0.0.0 --- pkgs/by-name/pl/planarity/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/planarity/package.nix b/pkgs/by-name/pl/planarity/package.nix index c7e11394511b..32c19c891b0d 100644 --- a/pkgs/by-name/pl/planarity/package.nix +++ b/pkgs/by-name/pl/planarity/package.nix @@ -3,21 +3,23 @@ stdenv, fetchFromGitHub, autoreconfHook, + pkg-config, }: stdenv.mkDerivation rec { pname = "planarity"; - version = "3.0.2.0"; + version = "4.0.0.0"; src = fetchFromGitHub { owner = "graph-algorithms"; repo = "edge-addition-planarity-suite"; rev = "Version_${version}"; - sha256 = "sha256-cUAh2MXCSmtxFtV6iTHgSRgsq/26DjWwxhWJH1+367A="; + sha256 = "sha256-A7huHvMgUyvw2zM9qA7Ax/1Ai5VZ6A1PZIo3eiCpu44="; }; nativeBuildInputs = [ autoreconfHook + pkg-config ]; doCheck = true; From 2694e87a3a61cc796d0af6d2af555062f698b511 Mon Sep 17 00:00:00 2001 From: kiria-moe Date: Tue, 1 Apr 2025 18:36:55 +0800 Subject: [PATCH 045/240] trojan-go: chore Set the version and commit id. --- pkgs/by-name/tr/trojan-go/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/tr/trojan-go/package.nix b/pkgs/by-name/tr/trojan-go/package.nix index 7d75473ce924..7724ca0924a6 100644 --- a/pkgs/by-name/tr/trojan-go/package.nix +++ b/pkgs/by-name/tr/trojan-go/package.nix @@ -19,6 +19,11 @@ buildGoModule rec { vendorHash = "sha256-c6H/8/dmCWasFKVR15U/kty4AzQAqmiL/VLKrPtH+s4="; + ldflags = [ + "-X github.com/p4gefau1t/trojan-go/constant.Version=v${version}" + "-X github.com/p4gefau1t/trojan-go/constant.Commit=v${version}" + ]; + tags = [ "api" "client" From deed74a325bed9e4abe7859d2c9865ebfd6123ad Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Tue, 8 Apr 2025 11:05:54 -0300 Subject: [PATCH 046/240] nauty: 2.8.8 -> 2.8.9 --- pkgs/by-name/na/nauty/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nauty/package.nix b/pkgs/by-name/na/nauty/package.nix index 0963586a049d..bff4157ce7b8 100644 --- a/pkgs/by-name/na/nauty/package.nix +++ b/pkgs/by-name/na/nauty/package.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { pname = "nauty"; - version = "2.8.8"; + version = "2.8.9"; src = fetchurl { url = "https://pallini.di.uniroma1.it/nauty${ builtins.replaceStrings [ "." ] [ "_" ] version }.tar.gz"; - sha256 = "sha256-FZ0hVoEKa7JAQQzWHrZBrdhQiNnxXIiM2qN7hoH5Kc4="; + sha256 = "sha256-yXq0K/SHlqhqWYvOPpJpBHyisywU/CPgcgiiRP5SxO4="; }; outputs = [ @@ -19,6 +19,9 @@ stdenv.mkDerivation rec { "dev" ]; + # HACK: starting from 2.8.9, the makefile tries to copy .libs/*.a files unconditionally + dontDisableStatic = true; + configureFlags = [ # Prevent nauty from sniffing some cpu features. While those are very # widely available, it can lead to nasty bugs when they are not available: From 14beb986226f569506f4cbbfc3dbae05feaa2bdd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Apr 2025 13:51:48 +0000 Subject: [PATCH 047/240] kargo: 1.3.2 -> 1.4.0 Co-authored-by: dtomvan <18gatenmaker6@gmail.com> --- pkgs/by-name/ka/kargo/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ka/kargo/package.nix b/pkgs/by-name/ka/kargo/package.nix index 64e66069958e..cb74557dc06a 100644 --- a/pkgs/by-name/ka/kargo/package.nix +++ b/pkgs/by-name/ka/kargo/package.nix @@ -11,22 +11,22 @@ buildGoModule rec { pname = "kargo"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "akuity"; repo = "kargo"; tag = "v${version}"; - hash = "sha256-sLcNY6TopRObyU+TAFsX8odRJTo9BufCKb/pKhg9pwA="; + hash = "sha256-1zPSYvAhobhcZWIeIh0zTYPMg32r4PATvBIfKEcg9IU="; }; - vendorHash = "sha256-Xb+9zu2uivOYETtz3ryMnBUJ3gJ/1ta1dLEpsD00jpU="; + vendorHash = "sha256-+c7cUCI6Yy3qzDOWWvqEGss6QvTrS3gYScm8M48rGVA="; subPackages = [ "cmd/cli" ]; ldflags = let - package_url = "github.com/akuity/kargo/internal/version"; + package_url = "github.com/akuity/kargo/pkg/x/version"; in [ "-s" From 0fee537cae4534a894acfc6bc88b8481cc4ab61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danilo=20B=C3=BCrger?= Date: Tue, 8 Apr 2025 19:03:56 +0100 Subject: [PATCH 048/240] maintainers: add danilobuerger --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fe8b6b20dd04..aadbcd60b29b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5392,6 +5392,12 @@ githubId = 64467514; name = "Daniel Krywult"; }; + danilobuerger = { + email = "info@danilobuerger.de"; + github = "danilobuerger"; + githubId = 996231; + name = "Danilo Bürger"; + }; daniyalsuri6 = { email = "daniyal.suri@gmail.com"; github = "daniyalsuri6"; From 98ec4b1a824dcba01fd65ac8de8082d9f2ead662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danilo=20B=C3=BCrger?= Date: Tue, 8 Apr 2025 19:04:13 +0100 Subject: [PATCH 049/240] buffrs: init at 0.9.0 Co-authored-by: Pierre-Etienne Meunier --- pkgs/by-name/bu/buffrs/package.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/bu/buffrs/package.nix diff --git a/pkgs/by-name/bu/buffrs/package.nix b/pkgs/by-name/bu/buffrs/package.nix new file mode 100644 index 000000000000..0b17c5e9d2cd --- /dev/null +++ b/pkgs/by-name/bu/buffrs/package.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "buffrs"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "helsing-ai"; + repo = "buffrs"; + tag = "v${version}"; + hash = "sha256-c9GjSqVp2wEFgoy8j+Gy5FA3SG4JYEfeSwPWjW81w3Y="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-E7kskULt2eOY+mZjh6jAftj8ciExUF7d1z1pePTBzvQ="; + + # Disabling tests meant to work over the network, as they will fail + # inside the builder. + checkFlags = [ + "--skip=cmd::install::upgrade::fixture" + "--skip=cmd::publish::lib::fixture" + "--skip=cmd::publish::local::fixture" + "--skip=cmd::tuto::fixture" + ]; + + meta = { + description = "Modern protobuf package management"; + homepage = "https://github.com/helsing-ai/buffrs"; + license = lib.licenses.asl20; + mainProgram = "buffrs"; + maintainers = with lib.maintainers; [ danilobuerger ]; + }; +} From f32ae9bf8c9414351ef2960a407128311dd9cec7 Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Tue, 8 Apr 2025 15:00:03 +0200 Subject: [PATCH 050/240] gnucash: Move python lib patch to a separate file --- pkgs/by-name/gn/gnucash/0005-python-env.patch | 10 ++++++++++ pkgs/by-name/gn/gnucash/package.nix | 17 ++++++----------- 2 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 pkgs/by-name/gn/gnucash/0005-python-env.patch diff --git a/pkgs/by-name/gn/gnucash/0005-python-env.patch b/pkgs/by-name/gn/gnucash/0005-python-env.patch new file mode 100644 index 000000000000..7d04d0750c07 --- /dev/null +++ b/pkgs/by-name/gn/gnucash/0005-python-env.patch @@ -0,0 +1,10 @@ +--- a/bindings/python/__init__.py ++++ b/bindings/python/__init__.py +@@ -1,3 +1,7 @@ ++import os ++os.environ['GNC_DBD_DIR'] = '@gnc_dbd_dir@' ++os.environ['GSETTINGS_SCHEMA_DIR'] = '@gsettings_schema_dir@' ++ + # import all the symbols from gnucash_core, so basic gnucash stuff can be + # loaded with: + # >>> from gnucash import thingy diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix index ab5632cf143b..f652549a95df 100644 --- a/pkgs/by-name/gn/gnucash/package.nix +++ b/pkgs/by-name/gn/gnucash/package.nix @@ -26,6 +26,7 @@ webkitgtk_4_0, wrapGAppsHook3, python3, + replaceVars, }: stdenv.mkDerivation rec { @@ -86,20 +87,14 @@ stdenv.mkDerivation rec { ./0003-remove-valgrind.patch # this patch makes gnucash exec the Finance::Quote wrapper directly ./0004-exec-fq-wrapper.patch + # this patch adds in env vars to the Python lib that makes it able to find required resource files + ./0005-python-env.patch ]; postPatch = '' - patch -p0 <>> from gnucash import thingy - END_PATCH + substituteInPlace bindings/python/__init__.py \ + --subst-var-by gnc_dbd_dir "${libdbiDrivers}/lib/dbd" \ + --subst-var-by gsettings_schema_dir ${glib.makeSchemaPath "$out" "gnucash-${version}"}; ''; # this needs to be an environment variable and not a cmake flag to suppress From 5404b661983683e0686023cee92727e097aa0918 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Tue, 8 Apr 2025 21:03:30 +0200 Subject: [PATCH 051/240] matrix-synapse: 1.127.1 -> 1.128.0 Release notes: https://github.com/element-hq/synapse/releases/tag/v1.128.0 Full changelog: https://github.com/element-hq/synapse/compare/v1.127.1...v1.128.0 --- pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index 2090477f2050..2e37b113d49a 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -17,20 +17,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.127.1"; + version = "1.128.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-DNUKbb+d3BBp8guas6apQ4yFeXCc0Ilijtbt1hZkap4="; + hash = "sha256-QgVx/9mZ3Do+42YwO8OtI2dcuckMX/xIaiBUi4HrK4Q="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-wI3vOfR5UpVFls2wPfgeIEj2+bmWdL3pDSsKfT+ysw8="; + hash = "sha256-PdAyEGLYmMLgcPQjzjuwvQo55olKgr079gsgQnUoKTM="; }; postPatch = '' From 899f54447412cecf59a85c7b4c7b44416baedaa3 Mon Sep 17 00:00:00 2001 From: Winter Date: Mon, 7 Apr 2025 22:34:54 -0400 Subject: [PATCH 052/240] wireguard-go: 0.0.20230223 -> 0-unstable-2023-12-11; unbreak 9e2f3860220280a5630971478b53c8ad9a991ca8 [0] fixed the compilation on Go >1.22, but there are a bunch of fixes after the latest tag that I think make sense to pull in at this point. [0]: https://git.zx2c4.com/wireguard-go/commit/?id=9e2f3860220280a5630971478b53c8ad9a991ca8 --- .../tools/networking/wireguard-go/default.nix | 85 ++++++++++--------- 1 file changed, 46 insertions(+), 39 deletions(-) diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 8e4908c20a7f..fbc5ad5ee595 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -6,49 +6,56 @@ wireguard-go, }: -buildGoModule rec { - pname = "wireguard-go"; - version = "0.0.20230223"; +buildGoModule ( + finalAttrs: + let + rev = "12269c2761734b15625017d8565745096325392f"; + shortVer = "${finalAttrs.version} (${lib.substring 0 7 rev})"; + in + { + pname = "wireguard-go"; + version = "0-unstable-2023-12-11"; - src = fetchzip { - url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "sha256-ZVWbZwSpxQvxwySS3cfzdRReFtHWk6LT2AuIe10hyz0="; - }; + src = fetchzip { + url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${rev}.tar.xz"; + hash = "sha256-br7/dwr/e4HvBGJXh+6lWqxBUezt5iZNy9BFqEA1bLk="; + }; - postPatch = '' - # Skip formatting tests - rm -f format_test.go - ''; + postPatch = '' + # Skip formatting tests + rm -f format_test.go - vendorHash = "sha256-i6ncA71R0hi1SzqCLphhtF3yRAHDmOdYJQ6pf3UDBg8="; + # Inject version + printf 'package main\n\nconst Version = "${shortVer}"' > version.go + ''; - subPackages = [ "." ]; + vendorHash = "sha256-RqZ/3+Xus5N1raiUTUpiKVBs/lrJQcSwr1dJib2ytwc="; - ldflags = [ - "-s" - "-w" - ]; + subPackages = [ "." ]; - postInstall = '' - mv $out/bin/wireguard $out/bin/wireguard-go - ''; - - passthru.tests.version = testers.testVersion { - package = wireguard-go; - version = "v${version}"; - }; - - meta = with lib; { - description = "Userspace Go implementation of WireGuard"; - homepage = "https://git.zx2c4.com/wireguard-go/about/"; - license = licenses.mit; - maintainers = with maintainers; [ - kirelagin - zx2c4 + ldflags = [ + "-s" + "-w" ]; - mainProgram = "wireguard-go"; - # Doesn't build with Go toolchain >1.22, build error: - # 'link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg'. - broken = true; - }; -} + + postInstall = '' + mv $out/bin/wireguard $out/bin/wireguard-go + ''; + + passthru.tests.version = testers.testVersion { + package = wireguard-go; + version = "v${shortVer}"; + }; + + meta = with lib; { + description = "Userspace Go implementation of WireGuard"; + homepage = "https://git.zx2c4.com/wireguard-go/about/"; + license = licenses.mit; + maintainers = with maintainers; [ + kirelagin + zx2c4 + ]; + mainProgram = "wireguard-go"; + }; + } +) From fc42896d3bd1b18af0f869b1476bd02f3d7fa82d Mon Sep 17 00:00:00 2001 From: Winter Date: Tue, 8 Apr 2025 16:07:52 -0400 Subject: [PATCH 053/240] wireguard-go: move to by-name --- .../default.nix => by-name/wi/wireguard-go/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/networking/wireguard-go/default.nix => by-name/wi/wireguard-go/package.nix} (100%) diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/by-name/wi/wireguard-go/package.nix similarity index 100% rename from pkgs/tools/networking/wireguard-go/default.nix rename to pkgs/by-name/wi/wireguard-go/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 598fee2bfcba..4d5d03712451 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5674,8 +5674,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth; }; - wireguard-go = callPackage ../tools/networking/wireguard-go { }; - wring = nodePackages.wring; wyrd = callPackage ../tools/misc/wyrd { From 6396e1e8825d532b4b658bda660c87645d9c6912 Mon Sep 17 00:00:00 2001 From: Winter Date: Tue, 8 Apr 2025 16:14:52 -0400 Subject: [PATCH 054/240] wireguard-go: actually run tests None of the tests are in the root directory (except for the code formatting one), so they were never actually run until now. --- pkgs/by-name/wi/wireguard-go/package.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/by-name/wi/wireguard-go/package.nix b/pkgs/by-name/wi/wireguard-go/package.nix index fbc5ad5ee595..4b08fd5f5e35 100644 --- a/pkgs/by-name/wi/wireguard-go/package.nix +++ b/pkgs/by-name/wi/wireguard-go/package.nix @@ -38,6 +38,21 @@ buildGoModule ( "-w" ]; + # No tests besides the formatting one are in root. + # We can't override subPackages per-phase (and we don't + # want to needlessly build packages that have build + # constraints), so just use the upstream Makefile (that + # runs `go test ./...`) to actually run the tests. + checkPhase = '' + runHook preCheck + export GOFLAGS=''${GOFLAGS//-trimpath/} + make test + runHook postCheck + ''; + + # Tests require networking. + __darwinAllowLocalNetworking = finalAttrs.doCheck; + postInstall = '' mv $out/bin/wireguard $out/bin/wireguard-go ''; From 72fbd4cd59ca34e198d36b5daa246811bd7224b4 Mon Sep 17 00:00:00 2001 From: Winter Date: Tue, 8 Apr 2025 16:15:22 -0400 Subject: [PATCH 055/240] wireguard-go: add winter to maintainers The current maintainers seem to be inactive, and I'm willing to step in and keep this package alive. :) --- pkgs/by-name/wi/wireguard-go/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/wi/wireguard-go/package.nix b/pkgs/by-name/wi/wireguard-go/package.nix index 4b08fd5f5e35..b3101b3da3a2 100644 --- a/pkgs/by-name/wi/wireguard-go/package.nix +++ b/pkgs/by-name/wi/wireguard-go/package.nix @@ -68,6 +68,7 @@ buildGoModule ( license = licenses.mit; maintainers = with maintainers; [ kirelagin + winter zx2c4 ]; mainProgram = "wireguard-go"; From 57af7751e818a835168c5efd82b9e4b59a655156 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 14 Mar 2025 18:57:10 -0400 Subject: [PATCH 056/240] ecryptfs-helper: remove package --- pkgs/tools/security/ecryptfs/helper.nix | 36 ------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/tools/security/ecryptfs/helper.nix diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix deleted file mode 100644 index 4f2070f8bd28..000000000000 --- a/pkgs/tools/security/ecryptfs/helper.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - makeWrapper, - python2, -}: - -stdenv.mkDerivation { - pname = "ecryptfs-helper"; - version = "20160722"; - - src = fetchurl { - url = "https://gist.githubusercontent.com/obadz/ec053fdb00dcb48441d8313169874e30/raw/4b657a4b7c3dc684e4d5e3ffaf46ced1b7675163/ecryptfs-helper.py"; - sha256 = "0gp4m22zc80814ng80s38hp930aa8r4zqihr7jr23m0m2iq4pdpg"; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - - # Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /run/wrappers/bin - installPhase = '' - mkdir -p $out/bin $out/libexec - cp $src $out/libexec/ecryptfs-helper.py - makeWrapper "${python2.interpreter}" "$out/bin/ecryptfs-helper" --add-flags "$out/libexec/ecryptfs-helper.py" - ''; - - meta = with lib; { - description = "Helper script to create/mount/unemount encrypted directories using eCryptfs without needing root permissions"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ obadz ]; - platforms = platforms.linux; - hydraPlatforms = [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f218415ab6b6..7257b0705ac9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -533,6 +533,7 @@ mapAliases { ec2_api_tools = throw "'ec2_api_tools' has been renamed to/replaced by 'ec2-api-tools'"; # Converted to throw 2024-10-17 ec2-utils = amazon-ec2-utils; # Added 2022-02-01 + ecryptfs-helper = throw "'ecryptfs-helper' has been removed, for filesystem-level encryption, use fscrypt"; # Added 2025-04-08 edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01 edgedb = throw "edgedb replaced to gel because of change of upstream"; # Added 2025-02-24 elasticsearch7Plugins = elasticsearchPlugins; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 736be54a296b..7d59ca8260fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3265,8 +3265,6 @@ with pkgs; ecryptfs = callPackage ../tools/security/ecryptfs { }; - ecryptfs-helper = callPackage ../tools/security/ecryptfs/helper.nix { }; - eid-mw = callPackage ../tools/security/eid-mw { autoreconfHook = buildPackages.autoreconfHook269; }; From eecafc9b97de8d7728a8cf7549b3a8b07517f6e9 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Apr 2025 22:12:37 -0500 Subject: [PATCH 057/240] yaziPlugins.full-border: init at 25.2.26-unstable-2025-03-11 --- pkgs/by-name/ya/yazi/plugins/default.nix | 10 ++++++ .../ya/yazi/plugins/full-border/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 47 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/default.nix create mode 100644 pkgs/by-name/ya/yazi/plugins/full-border/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/default.nix b/pkgs/by-name/ya/yazi/plugins/default.nix new file mode 100644 index 000000000000..80905a62b24a --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/default.nix @@ -0,0 +1,10 @@ +{ lib, callPackage }: +let + root = ./.; + call = name: callPackage (root + "/${name}") { }; +in +lib.pipe root [ + builtins.readDir + (lib.filterAttrs (_: type: type == "directory")) + (builtins.mapAttrs (name: _: call name)) +] diff --git a/pkgs/by-name/ya/yazi/plugins/full-border/default.nix b/pkgs/by-name/ya/yazi/plugins/full-border/default.nix new file mode 100644 index 000000000000..41aa381a49e6 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/full-border/default.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "full-border.yazi"; + version = "25.2.26-unstable-2025-03-11"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "92f78dc6d0a42569fd0e9df8f70670648b8afb78"; + hash = "sha256-mqo71VLZsHmgTybxgqKNo9F2QeMuCSvZ89uen1VbWb4="; + }; + + # NOTE: License is a relative symbolic link + # We remove the link and copy the true license + installPhase = '' + runHook preInstall + + cp -r full-border.yazi $out + rm $out/LICENSE + cp LICENSE $out + + runHook postInstall + ''; + + meta = { + description = "Add a full border to Yazi to make it look fancier"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3876c0063928..588586806394 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19571,6 +19571,8 @@ with pkgs; duden = python3Packages.toPythonApplication python3Packages.duden; + yaziPlugins = recurseIntoAttrs (callPackage ../by-name/ya/yazi/plugins { }); + yazi-unwrapped = callPackage ../by-name/ya/yazi-unwrapped/package.nix { inherit (darwin.apple_sdk.frameworks) Foundation; }; From f3013b40032128b37daf319bdf286bbb22ade75a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Apr 2025 22:18:02 -0500 Subject: [PATCH 058/240] yaziPlugins.chmod: init at 25.2.26-unstable-2025-03-02 --- .../by-name/ya/yazi/plugins/chmod/default.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/chmod/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/chmod/default.nix b/pkgs/by-name/ya/yazi/plugins/chmod/default.nix new file mode 100644 index 000000000000..231f7d558613 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/chmod/default.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "chmod.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + # NOTE: License is a relative symbolic link + # We remove the link and copy the true license + installPhase = '' + runHook preInstall + + cp -r chmod.yazi $out + rm $out/LICENSE + cp LICENSE $out + + runHook postInstall + ''; + + meta = { + description = "Execute chmod on the selected files to change their mode"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From 21f4687dd0ccfca0fff222d775efcb23df8bae61 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Apr 2025 22:21:56 -0500 Subject: [PATCH 059/240] yaziPlugins.diff: init at 25.2.7-unstable-2025-03-02 --- pkgs/by-name/ya/yazi/plugins/diff/default.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/diff/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/diff/default.nix b/pkgs/by-name/ya/yazi/plugins/diff/default.nix new file mode 100644 index 000000000000..6645b5e00c3f --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/diff/default.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "diff.yazi"; + version = "25.2.7-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + # NOTE: License is a relative symbolic link + # We remove the link and copy the true license + installPhase = '' + runHook preInstall + + cp -r diff.yazi $out + rm $out/LICENSE + cp LICENSE $out + + runHook postInstall + ''; + + meta = { + description = "Diff the selected file with the hovered file, create a living patch, and copy it to the clipboard"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From 7fc44f8731a0273a04948ae5501ace7f80beea1a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Apr 2025 22:25:40 -0500 Subject: [PATCH 060/240] yaziPlugins.git: init at 25.2.26-unstable-2025-03-17 --- pkgs/by-name/ya/yazi/plugins/git/default.nix | 35 ++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/git/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/git/default.nix b/pkgs/by-name/ya/yazi/plugins/git/default.nix new file mode 100644 index 000000000000..bf6f8b7f9720 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/git/default.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "git.yazi"; + version = "25.2.26-unstable-2025-03-17"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "79193b3917d0f1b82ee41b4e64ae4df58f2284f6"; + hash = "sha256-ZLL/dFjNsryjm51kFNOmw5DhSGl2K5IfatHpe1PkuFE="; + }; + + # NOTE: License is a relative symbolic link + # We remove the link and copy the true license + installPhase = '' + runHook preInstall + + cp -r git.yazi $out + rm $out/LICENSE + cp LICENSE $out + + runHook postInstall + ''; + + meta = { + description = "Show the status of Git file changes as linemode in the file list"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From bced223161be6c1a3f3096623d35b3a770c59b39 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Apr 2025 22:30:12 -0500 Subject: [PATCH 061/240] yaziPlugins.jump-to-char: init at 25.2.26-unstable-2025-03-02 --- .../ya/yazi/plugins/jump-to-char/default.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix b/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix new file mode 100644 index 000000000000..fa7ce86bad4e --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "jump-to-char.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + # NOTE: License is a relative symbolic link + # We remove the link and copy the true license + installPhase = '' + runHook preInstall + + cp -r jump-to-char.yazi $out + rm $out/LICENSE + cp LICENSE $out + + runHook postInstall + ''; + + meta = { + description = "Switch the preview pane between hidden and shown"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From 5726f00e0ef390fd6db242fce0effc2fb748ca25 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Apr 2025 22:32:35 -0500 Subject: [PATCH 062/240] yaziPlugins.lsar: init at 25.2.26-unstable-2025-03-02 --- pkgs/by-name/ya/yazi/plugins/lsar/default.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/lsar/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/lsar/default.nix b/pkgs/by-name/ya/yazi/plugins/lsar/default.nix new file mode 100644 index 000000000000..39485e605314 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/lsar/default.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "lsar.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + # NOTE: License is a relative symbolic link + # We remove the link and copy the true license + installPhase = '' + runHook preInstall + + cp -r lsar.yazi $out + rm $out/LICENSE + cp LICENSE $out + + runHook postInstall + ''; + + meta = { + description = "Previewing archive contents with lsar"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From 74f0b273e8fd1f749b596b0506965dd7e6b46e8f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Apr 2025 22:34:10 -0500 Subject: [PATCH 063/240] yaziPlugins.mactag: init at 25.2.26-unstable-2025-03-02 --- .../ya/yazi/plugins/mactag/default.nix | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/mactag/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/mactag/default.nix b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix new file mode 100644 index 000000000000..47c34d646ae0 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "mactag.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + # NOTE: License is a relative symbolic link + # We remove the link and copy the true license + installPhase = '' + runHook preInstall + + cp -r mactag.yazi $out + rm $out/LICENSE + cp LICENSE $out + + runHook postInstall + ''; + + meta = { + description = "Previewing archive contents with mactag"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + platforms = lib.platforms.darwin; + }; +} From 2f795537382bd2e81699d6cdb877673718946b52 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Apr 2025 22:35:34 -0500 Subject: [PATCH 064/240] yaziPlugins.mime-ext: init at 25.2.26-unstable-2025-03-02 --- .../ya/yazi/plugins/mime-ext/default.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix b/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix new file mode 100644 index 000000000000..44fd81b9a273 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "mime-ext.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + # NOTE: License is a relative symbolic link + # We remove the link and copy the true license + installPhase = '' + runHook preInstall + + cp -r mime-ext.yazi $out + rm $out/LICENSE + cp LICENSE $out + + runHook postInstall + ''; + + meta = { + description = "Previewing archive contents with mime-ext"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From 1f4d7934ef2ec6e88a82535608c159b35f505e1f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Apr 2025 22:40:04 -0500 Subject: [PATCH 065/240] yaziPlugins.mount: init at 25.2.26-unstable-2025-03-02 --- .../by-name/ya/yazi/plugins/mount/default.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/mount/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/mount/default.nix b/pkgs/by-name/ya/yazi/plugins/mount/default.nix new file mode 100644 index 000000000000..84b548f611b0 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/mount/default.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "mount.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + # NOTE: License is a relative symbolic link + # We remove the link and copy the true license + installPhase = '' + runHook preInstall + + cp -r mount.yazi $out + rm $out/LICENSE + cp LICENSE $out + + runHook postInstall + ''; + + meta = { + description = "Previewing archive contents with mount"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From df161471a64129529e793a48a072391ed26a05db Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Apr 2025 22:40:11 -0500 Subject: [PATCH 066/240] yaziPlugins.no-status: init at 25.2.7-unstable-2025-03-02 --- .../ya/yazi/plugins/no-status/default.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/no-status/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/no-status/default.nix b/pkgs/by-name/ya/yazi/plugins/no-status/default.nix new file mode 100644 index 000000000000..e67d2670bafb --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/no-status/default.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "no-status.yazi"; + version = "25.2.7-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + # NOTE: License is a relative symbolic link + # We remove the link and copy the true license + installPhase = '' + runHook preInstall + + cp -r no-status.yazi $out + rm $out/LICENSE + cp LICENSE $out + + runHook postInstall + ''; + + meta = { + description = "Previewing archive contents with no-status"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From 26301740909a4e1d5aea46b82c6bc02f9dba2e0c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Apr 2025 22:40:17 -0500 Subject: [PATCH 067/240] yaziPlugins.smart-enter: init at 25.2.26-unstable-2025-03-02 --- .../ya/yazi/plugins/smart-enter/default.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix new file mode 100644 index 000000000000..3018b701ad42 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "smart-enter.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + # NOTE: License is a relative symbolic link + # We remove the link and copy the true license + installPhase = '' + runHook preInstall + + cp -r smart-enter.yazi $out + rm $out/LICENSE + cp LICENSE $out + + runHook postInstall + ''; + + meta = { + description = "Previewing archive contents with smart-enter"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From 3cbedad39ae7bdd57de8c2fd372021e69bf5794d Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Apr 2025 22:40:24 -0500 Subject: [PATCH 068/240] yaziPlugins.smart-filter: init at 25.2.26-unstable-2025-03-02 --- .../ya/yazi/plugins/smart-filter/default.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix new file mode 100644 index 000000000000..21a19ff0d69d --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "smart-filter.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + # NOTE: License is a relative symbolic link + # We remove the link and copy the true license + installPhase = '' + runHook preInstall + + cp -r smart-filter.yazi $out + rm $out/LICENSE + cp LICENSE $out + + runHook postInstall + ''; + + meta = { + description = "Previewing archive contents with smart-filter"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From 3b13b73f167c23d27b3c2b1a21394339ca405e4b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Apr 2025 22:40:32 -0500 Subject: [PATCH 069/240] yaziPlugins.toggle-pane: init at 25.2.26-unstable-2025-03-02 --- .../ya/yazi/plugins/toggle-pane/default.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix new file mode 100644 index 000000000000..12a98bf119ae --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "toggle-pane.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "273019910c1111a388dd20e057606016f4bd0d17"; + hash = "sha256-80mR86UWgD11XuzpVNn56fmGRkvj0af2cFaZkU8M31I="; + }; + + # NOTE: License is a relative symbolic link + # We remove the link and copy the true license + installPhase = '' + runHook preInstall + + cp -r toggle-pane.yazi $out + rm $out/LICENSE + cp LICENSE $out + + runHook postInstall + ''; + + meta = { + description = "Previewing archive contents with toggle-pane"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From 7304dc8969d8016e1cfdb451fa95f2835f6d259c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Apr 2025 22:42:27 -0500 Subject: [PATCH 070/240] yaziPlugins.vcs-files: init at 25.3.7-unstable-2025-03-07 --- .../ya/yazi/plugins/vcs-files/default.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix new file mode 100644 index 000000000000..80364c0615f7 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "vcs-files.yazi"; + version = "25.3.7-unstable-2025-03-07"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "273019910c1111a388dd20e057606016f4bd0d17"; + hash = "sha256-80mR86UWgD11XuzpVNn56fmGRkvj0af2cFaZkU8M31I="; + }; + + # NOTE: License is a relative symbolic link + # We remove the link and copy the true license + installPhase = '' + runHook preInstall + + cp -r vcs-files.yazi $out + rm $out/LICENSE + cp LICENSE $out + + runHook postInstall + ''; + + meta = { + description = "Previewing archive contents with vcs-files"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From beeb8772358a00f4ea3a5f853c08aac01a8bcaed Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 6 Apr 2025 21:24:25 -0500 Subject: [PATCH 071/240] yaziPlugins.glow: init at 0-unstable-2025-02-22 --- pkgs/by-name/ya/yazi/plugins/glow/default.nix | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/glow/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/glow/default.nix b/pkgs/by-name/ya/yazi/plugins/glow/default.nix new file mode 100644 index 000000000000..b97cda4a4937 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/glow/default.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "glow.yazi"; + version = "0-unstable-2025-02-22"; + + src = fetchFromGitHub { + owner = "Reledia"; + repo = "glow.yazi"; + rev = "c76bf4fb612079480d305fe6fe570bddfe4f99d3"; + hash = "sha256-DPud1Mfagl2z490f5L69ZPnZmVCa0ROXtFeDbEegBBU="; + }; + + installPhase = '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; + + meta = { + description = "Glow preview plugin for yazi."; + homepage = "https://github.com/Reledia/glow.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From 009f451af174131b5356863e45000bbbf691025d Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 6 Apr 2025 21:26:33 -0500 Subject: [PATCH 072/240] yaziPlugins.miller: init at 0-unstable-2025-08-28 --- .../ya/yazi/plugins/miller/default.nix | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/miller/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/miller/default.nix b/pkgs/by-name/ya/yazi/plugins/miller/default.nix new file mode 100644 index 000000000000..c83f51648c1d --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/miller/default.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "miller.yazi"; + version = "0-unstable-2024-08-28"; + + src = fetchFromGitHub { + owner = "Reledia"; + repo = "miller.yazi"; + rev = "40e02654725a9902b689114537626207cbf23436"; + hash = "sha256-GXZZ/vI52rSw573hoMmspnuzFoBXDLcA0fqjF76CdnY="; + }; + + installPhase = '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; + + meta = { + description = "Miller, now in yazi."; + homepage = "https://github.com/Reledia/miller.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From a204dc4b723236a152abdf898164ab0c49035683 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 6 Apr 2025 21:32:45 -0500 Subject: [PATCH 073/240] yaziPlugins.mediainfo: init at 25.2.7-unstable-2025-04-5 --- .../ya/yazi/plugins/mediainfo/default.nix | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix new file mode 100644 index 000000000000..ffcbd12286be --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "mediainfo.yazi"; + version = "25.2.7-unstable-2025-04-05"; + + src = fetchFromGitHub { + owner = "boydaihungst"; + repo = "mediainfo.yazi"; + rev = "436cb5f04d6e5e86ddc0386527254d87b7751ec8"; + hash = "sha256-oFp8mJ62FsJX46mKQ7/o6qXPC9qx3+oSfqS0cKUZETI="; + }; + + installPhase = '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; + + meta = { + description = "Yazi plugin for previewing media files."; + homepage = "https://github.com/boydaihungst/mediainfo.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From b762826ab8d6f05d0204b601349c650f3fe64c2c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 7 Apr 2025 19:50:05 -0500 Subject: [PATCH 074/240] yaziPlugins.restore: init at 25.2.7-unstable-2025-04-04 --- .../ya/yazi/plugins/restore/default.nix | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/restore/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/restore/default.nix b/pkgs/by-name/ya/yazi/plugins/restore/default.nix new file mode 100644 index 000000000000..be3bb09d22a8 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/restore/default.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "restore.yazi"; + version = "25.2.7-unstable-2025-04-04"; + + src = fetchFromGitHub { + owner = "boydaihungst"; + repo = "restore.yazi"; + rev = "328dd888c1e2b9b0cb5dc806f099e3164e179620"; + hash = "sha256-3Z8P25u9bffdjrPjxLRWUQn6MdBS+vyElUBkgV4EUwY="; + }; + + installPhase = '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; + + meta = { + description = "Undo/Recover trashed files/folders."; + homepage = "https://github.com/boydaihungst/restore.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From 7e1fba2ecdbab8c8c60e45cdc62ce0a6d9615026 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 7 Apr 2025 20:18:24 -0500 Subject: [PATCH 075/240] yaziPlugins.ouch: init at 0-unstable-2025-03-29 --- pkgs/by-name/ya/yazi/plugins/ouch/default.nix | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/ouch/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/ouch/default.nix b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix new file mode 100644 index 000000000000..926bb72682cd --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "ouch.yazi"; + version = "0-unstable-2025-03-29"; + + src = fetchFromGitHub { + owner = "ndtoan96"; + repo = "ouch.yazi"; + rev = "558188d2479d73cafb7ad8fb1bee12b2b59fb607"; + hash = "sha256-7X8uAiJ8vBXYBXOgyKhVVikOnTBGrdCcXOJemjQNolI="; + }; + + installPhase = '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; + + meta = { + description = "A Yazi plugin to preview archives."; + homepage = "https://github.com/ndtoan96/ouch.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From 456354cc453db8f3503f266be322f6e421b6a396 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 8 Apr 2025 11:06:25 -0500 Subject: [PATCH 076/240] yaziPlugins.sudo: init at 0-unstable-2025-02-08 --- pkgs/by-name/ya/yazi/plugins/sudo/default.nix | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/sudo/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/sudo/default.nix b/pkgs/by-name/ya/yazi/plugins/sudo/default.nix new file mode 100644 index 000000000000..be514225279b --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/sudo/default.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "sudo.yazi"; + version = "0-unstable-2025-02-08"; + + src = fetchFromGitHub { + owner = "TD-Sky"; + repo = "sudo.yazi"; + rev = "af70636fbcf30ef17f77c5ffcfcbf1342c554be1"; + hash = "sha256-IvTBAhZrbrNJ5nsLxr35V0ntQw89yXUdoU9ashbflYY="; + }; + + installPhase = '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; + + meta = { + description = "Call `sudo` in yazi."; + homepage = "https://github.com/TD-Sky/sudo.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From 88142f876461ed90cb9cfe8eb84c361e0d282894 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 8 Apr 2025 11:14:15 -0500 Subject: [PATCH 077/240] yaziPlugins.relative-motions: init at 25.2.7-unstable-2025-04-07 --- .../yazi/plugins/relative-motions/default.nix | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix b/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix new file mode 100644 index 000000000000..1f1182a5e8f9 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "relative-motions.yazi"; + version = "25.2.7-unstable-2025-04-07"; + + src = fetchFromGitHub { + owner = "dedukun"; + repo = "relative-motions.yazi"; + rev = "61ae7950daeea3e1d960aa777b7a07cde4539b29"; + hash = "sha256-L5B5X762rBoxgKrUi0uRLDmAOJ/jPALc2bP9MYLiGYw="; + }; + + installPhase = '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; + + meta = { + description = "Yazi plugin based about vim motions."; + homepage = "https://github.com/dedukun/relative-motions.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From bab4c74cbffb645f0721a0f99c63d7dec0f22ec9 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 8 Apr 2025 11:16:35 -0500 Subject: [PATCH 078/240] yaziPlugins.starship: init at 25.2.7-unstable-2025-02-23 --- .../ya/yazi/plugins/starship/default.nix | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/starship/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/starship/default.nix b/pkgs/by-name/ya/yazi/plugins/starship/default.nix new file mode 100644 index 000000000000..b24020a6ed1c --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/starship/default.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "starship.yazi"; + version = "25.2.7-unstable-2025-02-23"; + + src = fetchFromGitHub { + owner = "Rolv-Apneseth"; + repo = "starship.yazi"; + rev = "6c639b474aabb17f5fecce18a4c97bf90b016512"; + hash = "sha256-bhLUziCDnF4QDCyysRn7Az35RAy8ibZIVUzoPgyEO1A="; + }; + + installPhase = '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; + + meta = { + description = "Starship prompt plugin for yazi."; + homepage = "https://github.com/Rolv-Apneseth/starship.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From a4bc0854b3fc56626f3549fe889fb27d969c5e92 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 8 Apr 2025 11:18:31 -0500 Subject: [PATCH 079/240] yaziPlugins.bypass: init at 0-unstable-2025-02-16 --- .../ya/yazi/plugins/bypass/default.nix | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/bypass/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/bypass/default.nix b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix new file mode 100644 index 000000000000..66f1a52e0d93 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "bypass.yazi"; + version = "0-unstable-2025-02-16"; + + src = fetchFromGitHub { + owner = "Rolv-Apneseth"; + repo = "bypass.yazi"; + rev = "ecb1f7f6fd305ff4ffff548fa955595af6b26e60"; + hash = "sha256-XXp4XflrVrs8FrUCRUbSxWZTSGPrIGrpqvB1pARerKQ="; + }; + + installPhase = '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; + + meta = { + description = "Yazi plugin for skipping directories with only a single sub-directory."; + homepage = "https://github.com/Rolv-Apneseth/bypass.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} From 834ae553534b6e98aca3e78615b7cf93c67fd259 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 8 Apr 2025 17:47:11 -0500 Subject: [PATCH 080/240] yaziPlugins: use a helper function for creating derivations --- .../ya/yazi/plugins/bypass/default.nix | 12 +---- .../by-name/ya/yazi/plugins/chmod/default.nix | 16 +----- pkgs/by-name/ya/yazi/plugins/default.nix | 54 ++++++++++++++++++- pkgs/by-name/ya/yazi/plugins/diff/default.nix | 16 +----- .../ya/yazi/plugins/full-border/default.nix | 16 +----- pkgs/by-name/ya/yazi/plugins/git/default.nix | 16 +----- pkgs/by-name/ya/yazi/plugins/glow/default.nix | 12 +---- .../ya/yazi/plugins/jump-to-char/default.nix | 16 +----- pkgs/by-name/ya/yazi/plugins/lsar/default.nix | 16 +----- .../ya/yazi/plugins/mactag/default.nix | 16 +----- .../ya/yazi/plugins/mediainfo/default.nix | 12 +---- .../ya/yazi/plugins/miller/default.nix | 12 +---- .../ya/yazi/plugins/mime-ext/default.nix | 16 +----- .../by-name/ya/yazi/plugins/mount/default.nix | 16 +----- .../ya/yazi/plugins/no-status/default.nix | 16 +----- pkgs/by-name/ya/yazi/plugins/ouch/default.nix | 12 +---- .../yazi/plugins/relative-motions/default.nix | 12 +---- .../ya/yazi/plugins/restore/default.nix | 12 +---- .../ya/yazi/plugins/smart-enter/default.nix | 16 +----- .../ya/yazi/plugins/smart-filter/default.nix | 16 +----- .../ya/yazi/plugins/starship/default.nix | 12 +---- pkgs/by-name/ya/yazi/plugins/sudo/default.nix | 12 +---- .../ya/yazi/plugins/toggle-pane/default.nix | 16 +----- .../ya/yazi/plugins/vcs-files/default.nix | 16 +----- 24 files changed, 98 insertions(+), 288 deletions(-) diff --git a/pkgs/by-name/ya/yazi/plugins/bypass/default.nix b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix index 66f1a52e0d93..e04999b8262c 100644 --- a/pkgs/by-name/ya/yazi/plugins/bypass/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "bypass.yazi"; version = "0-unstable-2025-02-16"; @@ -14,14 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-XXp4XflrVrs8FrUCRUbSxWZTSGPrIGrpqvB1pARerKQ="; }; - installPhase = '' - runHook preInstall - - cp -r . $out - - runHook postInstall - ''; - meta = { description = "Yazi plugin for skipping directories with only a single sub-directory."; homepage = "https://github.com/Rolv-Apneseth/bypass.yazi"; diff --git a/pkgs/by-name/ya/yazi/plugins/chmod/default.nix b/pkgs/by-name/ya/yazi/plugins/chmod/default.nix index 231f7d558613..ea34d479322e 100644 --- a/pkgs/by-name/ya/yazi/plugins/chmod/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/chmod/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "chmod.yazi"; version = "25.2.26-unstable-2025-03-02"; @@ -14,18 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; }; - # NOTE: License is a relative symbolic link - # We remove the link and copy the true license - installPhase = '' - runHook preInstall - - cp -r chmod.yazi $out - rm $out/LICENSE - cp LICENSE $out - - runHook postInstall - ''; - meta = { description = "Execute chmod on the selected files to change their mode"; homepage = "https://yazi-rs.github.io"; diff --git a/pkgs/by-name/ya/yazi/plugins/default.nix b/pkgs/by-name/ya/yazi/plugins/default.nix index 80905a62b24a..6fbde69e2b1b 100644 --- a/pkgs/by-name/ya/yazi/plugins/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/default.nix @@ -1,10 +1,60 @@ -{ lib, callPackage }: +{ + lib, + callPackage, + stdenvNoCC, +}: let root = ./.; - call = name: callPackage (root + "/${name}") { }; + + mkYaziPlugin = + args@{ + pname, + src, + meta ? { }, + installPhase ? null, + ... + }: + stdenvNoCC.mkDerivation ( + args + // { + installPhase = + if installPhase != null then + installPhase + else if (src ? owner && src.owner == "yazi-rs") then + # NOTE: License is a relative symbolic link + # We remove the link and copy the true license + '' + runHook preInstall + + cp -r ${pname} $out + rm $out/LICENSE + cp LICENSE $out + + runHook postInstall + '' + else + # Normal plugins don't require special installation other than to copy their contents. + '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; + meta = meta // { + description = meta.description or ""; + platforms = meta.platforms or lib.platforms.all; + }; + } + ); + + call = name: callPackage (root + "/${name}") { inherit mkYaziPlugin; }; in lib.pipe root [ builtins.readDir (lib.filterAttrs (_: type: type == "directory")) (builtins.mapAttrs (name: _: call name)) ] +// { + inherit mkYaziPlugin; +} diff --git a/pkgs/by-name/ya/yazi/plugins/diff/default.nix b/pkgs/by-name/ya/yazi/plugins/diff/default.nix index 6645b5e00c3f..f8500fc742c1 100644 --- a/pkgs/by-name/ya/yazi/plugins/diff/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/diff/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "diff.yazi"; version = "25.2.7-unstable-2025-03-02"; @@ -14,18 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; }; - # NOTE: License is a relative symbolic link - # We remove the link and copy the true license - installPhase = '' - runHook preInstall - - cp -r diff.yazi $out - rm $out/LICENSE - cp LICENSE $out - - runHook postInstall - ''; - meta = { description = "Diff the selected file with the hovered file, create a living patch, and copy it to the clipboard"; homepage = "https://yazi-rs.github.io"; diff --git a/pkgs/by-name/ya/yazi/plugins/full-border/default.nix b/pkgs/by-name/ya/yazi/plugins/full-border/default.nix index 41aa381a49e6..90bbaf5f64ec 100644 --- a/pkgs/by-name/ya/yazi/plugins/full-border/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/full-border/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "full-border.yazi"; version = "25.2.26-unstable-2025-03-11"; @@ -14,18 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-mqo71VLZsHmgTybxgqKNo9F2QeMuCSvZ89uen1VbWb4="; }; - # NOTE: License is a relative symbolic link - # We remove the link and copy the true license - installPhase = '' - runHook preInstall - - cp -r full-border.yazi $out - rm $out/LICENSE - cp LICENSE $out - - runHook postInstall - ''; - meta = { description = "Add a full border to Yazi to make it look fancier"; homepage = "https://yazi-rs.github.io"; diff --git a/pkgs/by-name/ya/yazi/plugins/git/default.nix b/pkgs/by-name/ya/yazi/plugins/git/default.nix index bf6f8b7f9720..f7ded87a9bee 100644 --- a/pkgs/by-name/ya/yazi/plugins/git/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/git/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "git.yazi"; version = "25.2.26-unstable-2025-03-17"; @@ -14,18 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-ZLL/dFjNsryjm51kFNOmw5DhSGl2K5IfatHpe1PkuFE="; }; - # NOTE: License is a relative symbolic link - # We remove the link and copy the true license - installPhase = '' - runHook preInstall - - cp -r git.yazi $out - rm $out/LICENSE - cp LICENSE $out - - runHook postInstall - ''; - meta = { description = "Show the status of Git file changes as linemode in the file list"; homepage = "https://yazi-rs.github.io"; diff --git a/pkgs/by-name/ya/yazi/plugins/glow/default.nix b/pkgs/by-name/ya/yazi/plugins/glow/default.nix index b97cda4a4937..b37e7481151c 100644 --- a/pkgs/by-name/ya/yazi/plugins/glow/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/glow/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "glow.yazi"; version = "0-unstable-2025-02-22"; @@ -14,14 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-DPud1Mfagl2z490f5L69ZPnZmVCa0ROXtFeDbEegBBU="; }; - installPhase = '' - runHook preInstall - - cp -r . $out - - runHook postInstall - ''; - meta = { description = "Glow preview plugin for yazi."; homepage = "https://github.com/Reledia/glow.yazi"; diff --git a/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix b/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix index fa7ce86bad4e..55269a5e7b04 100644 --- a/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "jump-to-char.yazi"; version = "25.2.26-unstable-2025-03-02"; @@ -14,18 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; }; - # NOTE: License is a relative symbolic link - # We remove the link and copy the true license - installPhase = '' - runHook preInstall - - cp -r jump-to-char.yazi $out - rm $out/LICENSE - cp LICENSE $out - - runHook postInstall - ''; - meta = { description = "Switch the preview pane between hidden and shown"; homepage = "https://yazi-rs.github.io"; diff --git a/pkgs/by-name/ya/yazi/plugins/lsar/default.nix b/pkgs/by-name/ya/yazi/plugins/lsar/default.nix index 39485e605314..95dbfcdf8aa1 100644 --- a/pkgs/by-name/ya/yazi/plugins/lsar/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/lsar/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "lsar.yazi"; version = "25.2.26-unstable-2025-03-02"; @@ -14,18 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; }; - # NOTE: License is a relative symbolic link - # We remove the link and copy the true license - installPhase = '' - runHook preInstall - - cp -r lsar.yazi $out - rm $out/LICENSE - cp LICENSE $out - - runHook postInstall - ''; - meta = { description = "Previewing archive contents with lsar"; homepage = "https://yazi-rs.github.io"; diff --git a/pkgs/by-name/ya/yazi/plugins/mactag/default.nix b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix index 47c34d646ae0..37e45598a26e 100644 --- a/pkgs/by-name/ya/yazi/plugins/mactag/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "mactag.yazi"; version = "25.2.26-unstable-2025-03-02"; @@ -14,18 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; }; - # NOTE: License is a relative symbolic link - # We remove the link and copy the true license - installPhase = '' - runHook preInstall - - cp -r mactag.yazi $out - rm $out/LICENSE - cp LICENSE $out - - runHook postInstall - ''; - meta = { description = "Previewing archive contents with mactag"; homepage = "https://yazi-rs.github.io"; diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix index ffcbd12286be..a1612b59e64a 100644 --- a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "mediainfo.yazi"; version = "25.2.7-unstable-2025-04-05"; @@ -14,14 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-oFp8mJ62FsJX46mKQ7/o6qXPC9qx3+oSfqS0cKUZETI="; }; - installPhase = '' - runHook preInstall - - cp -r . $out - - runHook postInstall - ''; - meta = { description = "Yazi plugin for previewing media files."; homepage = "https://github.com/boydaihungst/mediainfo.yazi"; diff --git a/pkgs/by-name/ya/yazi/plugins/miller/default.nix b/pkgs/by-name/ya/yazi/plugins/miller/default.nix index c83f51648c1d..abc48218c54f 100644 --- a/pkgs/by-name/ya/yazi/plugins/miller/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/miller/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "miller.yazi"; version = "0-unstable-2024-08-28"; @@ -14,14 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-GXZZ/vI52rSw573hoMmspnuzFoBXDLcA0fqjF76CdnY="; }; - installPhase = '' - runHook preInstall - - cp -r . $out - - runHook postInstall - ''; - meta = { description = "Miller, now in yazi."; homepage = "https://github.com/Reledia/miller.yazi"; diff --git a/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix b/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix index 44fd81b9a273..7aa72cba4817 100644 --- a/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "mime-ext.yazi"; version = "25.2.26-unstable-2025-03-02"; @@ -14,18 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; }; - # NOTE: License is a relative symbolic link - # We remove the link and copy the true license - installPhase = '' - runHook preInstall - - cp -r mime-ext.yazi $out - rm $out/LICENSE - cp LICENSE $out - - runHook postInstall - ''; - meta = { description = "Previewing archive contents with mime-ext"; homepage = "https://yazi-rs.github.io"; diff --git a/pkgs/by-name/ya/yazi/plugins/mount/default.nix b/pkgs/by-name/ya/yazi/plugins/mount/default.nix index 84b548f611b0..062c728c49bd 100644 --- a/pkgs/by-name/ya/yazi/plugins/mount/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/mount/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "mount.yazi"; version = "25.2.26-unstable-2025-03-02"; @@ -14,18 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; }; - # NOTE: License is a relative symbolic link - # We remove the link and copy the true license - installPhase = '' - runHook preInstall - - cp -r mount.yazi $out - rm $out/LICENSE - cp LICENSE $out - - runHook postInstall - ''; - meta = { description = "Previewing archive contents with mount"; homepage = "https://yazi-rs.github.io"; diff --git a/pkgs/by-name/ya/yazi/plugins/no-status/default.nix b/pkgs/by-name/ya/yazi/plugins/no-status/default.nix index e67d2670bafb..bf66c5235d47 100644 --- a/pkgs/by-name/ya/yazi/plugins/no-status/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/no-status/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "no-status.yazi"; version = "25.2.7-unstable-2025-03-02"; @@ -14,18 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; }; - # NOTE: License is a relative symbolic link - # We remove the link and copy the true license - installPhase = '' - runHook preInstall - - cp -r no-status.yazi $out - rm $out/LICENSE - cp LICENSE $out - - runHook postInstall - ''; - meta = { description = "Previewing archive contents with no-status"; homepage = "https://yazi-rs.github.io"; diff --git a/pkgs/by-name/ya/yazi/plugins/ouch/default.nix b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix index 926bb72682cd..2a6fa7c70853 100644 --- a/pkgs/by-name/ya/yazi/plugins/ouch/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "ouch.yazi"; version = "0-unstable-2025-03-29"; @@ -14,14 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-7X8uAiJ8vBXYBXOgyKhVVikOnTBGrdCcXOJemjQNolI="; }; - installPhase = '' - runHook preInstall - - cp -r . $out - - runHook postInstall - ''; - meta = { description = "A Yazi plugin to preview archives."; homepage = "https://github.com/ndtoan96/ouch.yazi"; diff --git a/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix b/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix index 1f1182a5e8f9..1ea04f712255 100644 --- a/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "relative-motions.yazi"; version = "25.2.7-unstable-2025-04-07"; @@ -14,14 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-L5B5X762rBoxgKrUi0uRLDmAOJ/jPALc2bP9MYLiGYw="; }; - installPhase = '' - runHook preInstall - - cp -r . $out - - runHook postInstall - ''; - meta = { description = "Yazi plugin based about vim motions."; homepage = "https://github.com/dedukun/relative-motions.yazi"; diff --git a/pkgs/by-name/ya/yazi/plugins/restore/default.nix b/pkgs/by-name/ya/yazi/plugins/restore/default.nix index be3bb09d22a8..ec1a45c27a9f 100644 --- a/pkgs/by-name/ya/yazi/plugins/restore/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/restore/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "restore.yazi"; version = "25.2.7-unstable-2025-04-04"; @@ -14,14 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-3Z8P25u9bffdjrPjxLRWUQn6MdBS+vyElUBkgV4EUwY="; }; - installPhase = '' - runHook preInstall - - cp -r . $out - - runHook postInstall - ''; - meta = { description = "Undo/Recover trashed files/folders."; homepage = "https://github.com/boydaihungst/restore.yazi"; diff --git a/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix index 3018b701ad42..7e54ccdd12bf 100644 --- a/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "smart-enter.yazi"; version = "25.2.26-unstable-2025-03-02"; @@ -14,18 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; }; - # NOTE: License is a relative symbolic link - # We remove the link and copy the true license - installPhase = '' - runHook preInstall - - cp -r smart-enter.yazi $out - rm $out/LICENSE - cp LICENSE $out - - runHook postInstall - ''; - meta = { description = "Previewing archive contents with smart-enter"; homepage = "https://yazi-rs.github.io"; diff --git a/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix b/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix index 21a19ff0d69d..417147a95e70 100644 --- a/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "smart-filter.yazi"; version = "25.2.26-unstable-2025-03-02"; @@ -14,18 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; }; - # NOTE: License is a relative symbolic link - # We remove the link and copy the true license - installPhase = '' - runHook preInstall - - cp -r smart-filter.yazi $out - rm $out/LICENSE - cp LICENSE $out - - runHook postInstall - ''; - meta = { description = "Previewing archive contents with smart-filter"; homepage = "https://yazi-rs.github.io"; diff --git a/pkgs/by-name/ya/yazi/plugins/starship/default.nix b/pkgs/by-name/ya/yazi/plugins/starship/default.nix index b24020a6ed1c..5d7394d9c9a9 100644 --- a/pkgs/by-name/ya/yazi/plugins/starship/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/starship/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "starship.yazi"; version = "25.2.7-unstable-2025-02-23"; @@ -14,14 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-bhLUziCDnF4QDCyysRn7Az35RAy8ibZIVUzoPgyEO1A="; }; - installPhase = '' - runHook preInstall - - cp -r . $out - - runHook postInstall - ''; - meta = { description = "Starship prompt plugin for yazi."; homepage = "https://github.com/Rolv-Apneseth/starship.yazi"; diff --git a/pkgs/by-name/ya/yazi/plugins/sudo/default.nix b/pkgs/by-name/ya/yazi/plugins/sudo/default.nix index be514225279b..94a6d3538431 100644 --- a/pkgs/by-name/ya/yazi/plugins/sudo/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/sudo/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "sudo.yazi"; version = "0-unstable-2025-02-08"; @@ -14,14 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-IvTBAhZrbrNJ5nsLxr35V0ntQw89yXUdoU9ashbflYY="; }; - installPhase = '' - runHook preInstall - - cp -r . $out - - runHook postInstall - ''; - meta = { description = "Call `sudo` in yazi."; homepage = "https://github.com/TD-Sky/sudo.yazi"; diff --git a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix index 12a98bf119ae..a77ea05970eb 100644 --- a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "toggle-pane.yazi"; version = "25.2.26-unstable-2025-03-02"; @@ -14,18 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-80mR86UWgD11XuzpVNn56fmGRkvj0af2cFaZkU8M31I="; }; - # NOTE: License is a relative symbolic link - # We remove the link and copy the true license - installPhase = '' - runHook preInstall - - cp -r toggle-pane.yazi $out - rm $out/LICENSE - cp LICENSE $out - - runHook postInstall - ''; - meta = { description = "Previewing archive contents with toggle-pane"; homepage = "https://yazi-rs.github.io"; diff --git a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix index 80364c0615f7..f83d4d766a21 100644 --- a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, fetchFromGitHub, + mkYaziPlugin, }: -stdenvNoCC.mkDerivation { +mkYaziPlugin { pname = "vcs-files.yazi"; version = "25.3.7-unstable-2025-03-07"; @@ -14,18 +14,6 @@ stdenvNoCC.mkDerivation { hash = "sha256-80mR86UWgD11XuzpVNn56fmGRkvj0af2cFaZkU8M31I="; }; - # NOTE: License is a relative symbolic link - # We remove the link and copy the true license - installPhase = '' - runHook preInstall - - cp -r vcs-files.yazi $out - rm $out/LICENSE - cp LICENSE $out - - runHook postInstall - ''; - meta = { description = "Previewing archive contents with vcs-files"; homepage = "https://yazi-rs.github.io"; From f1b4c9081205e97954de04cde326813f87255597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 8 Apr 2025 16:28:31 -0700 Subject: [PATCH 081/240] deltatouch: 1.10.2 -> 1.14.3 Diff: https://codeberg.org/lk108/deltatouch/compare/v1.10.2...v1.14.3 Changelog: https://codeberg.org/lk108/deltatouch/src/tag/v1.14.3/CHANGELOG --- pkgs/by-name/de/deltatouch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/deltatouch/package.nix b/pkgs/by-name/de/deltatouch/package.nix index 7b2d061fe88a..d2dfbb4ce306 100644 --- a/pkgs/by-name/de/deltatouch/package.nix +++ b/pkgs/by-name/de/deltatouch/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "deltatouch"; - version = "1.10.2"; + version = "1.14.3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "lk108"; repo = "deltatouch"; rev = "v${finalAttrs.version}"; - hash = "sha256-QcrBo7lrMYkOZGSyS5fLAwNxZwKFrylU5P5my2Jl93k="; + hash = "sha256-vumMAMm9+dKlmi5a6ehIDePpQKkco/smYSM1K/QiXu4="; }; nativeBuildInputs = [ From 54e2831b3294d952909a3698ca9155177272b5ca Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 8 Apr 2025 18:34:29 -0500 Subject: [PATCH 082/240] yaziPlugins.git: 25.2.26-unstable-2025-03-17 -> 25.4.4-unstable-2025-04-04 --- pkgs/by-name/ya/yazi/plugins/git/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yazi/plugins/git/default.nix b/pkgs/by-name/ya/yazi/plugins/git/default.nix index f7ded87a9bee..10b6b29acd8b 100644 --- a/pkgs/by-name/ya/yazi/plugins/git/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/git/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "git.yazi"; - version = "25.2.26-unstable-2025-03-17"; + version = "25.4.4-unstable-2025-04-04"; src = fetchFromGitHub { owner = "yazi-rs"; repo = "plugins"; - rev = "79193b3917d0f1b82ee41b4e64ae4df58f2284f6"; - hash = "sha256-ZLL/dFjNsryjm51kFNOmw5DhSGl2K5IfatHpe1PkuFE="; + rev = "9a095057d698aaaedc4dd23d638285bd3fd647e9"; + hash = "sha256-Lx+TliqMuaXpjaUtjdUac7ODg2yc3yrd1mSWJo9Mz2Q="; }; meta = { From 495299fc0b576258853d61d7a35bf85f7e267f06 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 8 Apr 2025 18:36:38 -0500 Subject: [PATCH 083/240] yaziPlugins.mime-ext: 25.2.26-unstable-2025-03-17 -> 25.4.4-unstable-2025-04-04 --- pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix b/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix index 7aa72cba4817..59a92e126702 100644 --- a/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "mime-ext.yazi"; - version = "25.2.26-unstable-2025-03-02"; + version = "25.4.4-unstable-2025-04-04"; src = fetchFromGitHub { owner = "yazi-rs"; repo = "plugins"; - rev = "b44c245500b34e713732a9130bf436b13b4777e9"; - hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + rev = "9a095057d698aaaedc4dd23d638285bd3fd647e9"; + hash = "sha256-Lx+TliqMuaXpjaUtjdUac7ODg2yc3yrd1mSWJo9Mz2Q="; }; meta = { From ce9b2ffcea4147aad35a38733ba53bc5119ad7cb Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 8 Apr 2025 18:36:45 -0500 Subject: [PATCH 084/240] yaziPlugins.mactag: 25.2.26-unstable-2025-03-17 -> 25.4.4-unstable-2025-04-04 --- pkgs/by-name/ya/yazi/plugins/mactag/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yazi/plugins/mactag/default.nix b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix index 37e45598a26e..991d71f97c7c 100644 --- a/pkgs/by-name/ya/yazi/plugins/mactag/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "mactag.yazi"; - version = "25.2.26-unstable-2025-03-02"; + version = "25.4.4-unstable-2025-04-04"; src = fetchFromGitHub { owner = "yazi-rs"; repo = "plugins"; - rev = "b44c245500b34e713732a9130bf436b13b4777e9"; - hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + rev = "9a095057d698aaaedc4dd23d638285bd3fd647e9"; + hash = "sha256-Lx+TliqMuaXpjaUtjdUac7ODg2yc3yrd1mSWJo9Mz2Q="; }; meta = { From d4a8babe9037722c5fe0f40068ba496d59c49492 Mon Sep 17 00:00:00 2001 From: Liam Murphy Date: Wed, 9 Apr 2025 13:12:12 +1000 Subject: [PATCH 085/240] judy: revert Darwin reproducibility fixes It was already reproducible: the only reason it seemed not to be was due to a quirk of how `--rebuild` works on macOS. Since the implementation of the Nix sandbox on macOS is unable to change the meaning of paths, when rebuilding a derivation, it can't be done at the same path as the original. Instead, the rebuild occurs with a different output path, and the output is scanned for instances of that path so that they can be replaced with the correct one afterwards (ala ca-derivations). Unfortunately, macOS's codesigning system seems to include the hash of the signed binary as part of its signature, including any incorrect paths it contains. This results in the binaries still being different after the path replacement step has occured. The reason to go out of our way to revert this is that the workaround to avoid including the output path in any binaries includes replacing the install name of judy with `@rpath/*` rather than its absolute path, which breaks at least one dependency that doesn't add it to RPATH (gtkwave), and possibly others. To confirm that it's reproducible: ``` drv=$(nix eval .#judy --apply "pkg: (pkg.overrideAttrs { __REBUILD = true; }).drvPath" --raw) out=$(nix derivation show "$drv" | jq -r ".[].outputs.out.path") nix build "$drv^*" --no-link cp -r "$out" rebuild-1 nix store delete "$out" --option keep-outputs false nix build "$drv^*" --no-link cp -r "$out" rebuild-2 diff -r rebuild-1 rebuild-2 ``` --- pkgs/by-name/ju/judy/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/ju/judy/package.nix b/pkgs/by-name/ju/judy/package.nix index df21e56c30ba..df3e01552303 100644 --- a/pkgs/by-name/ju/judy/package.nix +++ b/pkgs/by-name/ju/judy/package.nix @@ -23,11 +23,6 @@ stdenv.mkDerivation rec { ./fix-source-date.patch ]; - # fixes non-determinism between builds on macos - preConfigure = lib.optional stdenv.hostPlatform.isDarwin '' - export LDFLAGS="$LDFLAGS -Wl,-no_uuid -Wl,-install_name,@rpath/libJudy.1.dylib" - ''; - # Disable parallel builds as manpages lack some dependencies: # ../tool/jhton ext/JudyHS_funcs_3.htm | grep -v '^[ ]*$' | sed -e 's/\.C//' > man/man3/JudyHS_funcs # make[2]: *** No rule to make target 'man/man3/JSLD', needed by 'all-am'. Stop. From 4d62c8546862064d30282eab7423456fbe08d97f Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 26 Mar 2025 13:58:56 +0100 Subject: [PATCH 086/240] python3Packages.pytinyrenderer: init at 0.0.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- .../python-modules/pytinyrenderer/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/pytinyrenderer/default.nix diff --git a/pkgs/development/python-modules/pytinyrenderer/default.nix b/pkgs/development/python-modules/pytinyrenderer/default.nix new file mode 100644 index 000000000000..c2dc075095de --- /dev/null +++ b/pkgs/development/python-modules/pytinyrenderer/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: + +buildPythonPackage rec { + pname = "pytinyrenderer"; + version = "0.0.14"; + pyproject = true; + + # github has no tags + src = fetchPypi { + inherit pname version; + hash = "sha256-X+20eYUJy5EaA6O8no3o1NWqNrHeUuuHjv7xBLlaPRU="; + }; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ + "pytinyrenderer" + ]; + + # There are no tests in the pypi archive + doCheck = false; + + meta = { + description = "Python bindings for Tiny Renderer"; + homepage = "https://pypi.org/project/pytinyrenderer/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nim65s ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9abac7174fad..01db0f0e07f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14898,6 +14898,8 @@ self: super: with self; { pytimeparse2 = callPackage ../development/python-modules/pytimeparse2 { }; + pytinyrenderer = callPackage ../development/python-modules/pytinyrenderer { }; + pytlv = callPackage ../development/python-modules/pytlv { }; pytm = callPackage ../development/python-modules/pytm { }; From 7df412e59e7ecd8f4ed9eeaed997191cc8aa4f52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 08:41:13 +0000 Subject: [PATCH 087/240] flyctl: 0.3.94 -> 0.3.99 --- pkgs/by-name/fl/flyctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 35b6127ae73b..7a09a25b604e 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.3.94"; + version = "0.3.99"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-eCAnOoP5YQL/UCKex/lGiY28JswJTBmg+AIRrrDaAmc="; + hash = "sha256-vmmInlco4uxiFFTxSqxpaJCUbLbUWN3Iw4SDaRYaaOI="; }; - vendorHash = "sha256-OokZuh6wzu7xWu//T87n0tbFC3L+MpEJWkSaFJJJUVI="; + vendorHash = "sha256-iJdZDQaoaAf56wbE3v3apr6Zme4ZrY9PtfxAMncDM+Y="; subPackages = [ "." ]; From 114d8ce7a6d4e2583b18610b26a3957d1aca1352 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 09:11:11 +0000 Subject: [PATCH 088/240] python312Packages.pyghmi: 1.5.76 -> 1.5.77 --- pkgs/development/python-modules/pyghmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix index 5919b94fbeb9..002585da278f 100644 --- a/pkgs/development/python-modules/pyghmi/default.nix +++ b/pkgs/development/python-modules/pyghmi/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "pyghmi"; - version = "1.5.76"; + version = "1.5.77"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-nJEL9x/+fZT/vpAKL5qVLXYVPcMvUXT9WSEvHzOrGZU="; + hash = "sha256-RGV3d944MKrbuBM/eX9NIyHiasmLkkHH+zyeEjkIt7U="; }; build-system = [ From 30fe7315db909b116eb965b8eddb5864892a6b99 Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Sat, 5 Apr 2025 16:50:26 +0800 Subject: [PATCH 089/240] nixos/baikal: add it --- nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/baikal.nix | 141 +++++++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 nixos/modules/services/web-apps/baikal.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 902503335169..ba169bb5cdc2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1482,6 +1482,7 @@ ./services/web-apps/archtika.nix ./services/web-apps/artalk.nix ./services/web-apps/audiobookshelf.nix + ./services/web-apps/baikal.nix ./services/web-apps/bluemap.nix ./services/web-apps/bookstack.nix ./services/web-apps/c2fmzq-server.nix diff --git a/nixos/modules/services/web-apps/baikal.nix b/nixos/modules/services/web-apps/baikal.nix new file mode 100644 index 000000000000..91a007e6e541 --- /dev/null +++ b/nixos/modules/services/web-apps/baikal.nix @@ -0,0 +1,141 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + common-name = "baikal"; + cfg = config.services.baikal; +in +{ + meta.maintainers = [ lib.maintainers.wrvsrx ]; + options = { + services.baikal = { + enable = lib.mkEnableOption "baikal"; + user = lib.mkOption { + type = lib.types.str; + default = common-name; + description = '' + User account under which the web-application run. + ''; + }; + group = lib.mkOption { + type = lib.types.str; + default = common-name; + description = '' + Group account under which the web-application run. + ''; + }; + pool = lib.mkOption { + type = lib.types.str; + default = common-name; + description = '' + Name of existing phpfpm pool that is used to run web-application. + If not specified a pool will be created automatically with + default values. + ''; + }; + virtualHost = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = common-name; + description = '' + Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost. + ''; + }; + phpPackage = lib.mkOption { + type = lib.types.package; + default = pkgs.php; + defaultText = "pkgs.php"; + description = '' + php package to use for php fpm daemon. + ''; + }; + package = lib.mkOption { + type = lib.types.package; + default = pkgs.baikal; + defaultText = "pkgs.baikal"; + description = '' + Baikal package to use. + ''; + }; + + }; + }; + config = lib.mkIf cfg.enable { + services.phpfpm.pools = lib.mkIf (cfg.pool == "${common-name}") { + ${common-name} = { + inherit (cfg) user phpPackage; + phpEnv = { + "BAIKAL_PATH_CONFIG" = "/var/lib/baikal/config/"; + "BAIKAL_PATH_SPECIFIC" = "/var/lib/baikal/specific/"; + }; + settings = lib.mapAttrs (name: lib.mkDefault) { + "listen.owner" = "nginx"; + "listen.group" = "nginx"; + "listen.mode" = "0600"; + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 1; + "pm.min_spare_servers" = 1; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + "pm.process_idle_timeout" = 30; + "catch_workers_output" = 1; + }; + }; + }; + services.nginx = lib.mkIf (cfg.virtualHost != null) { + enable = true; + virtualHosts."${cfg.virtualHost}" = { + root = "${cfg.package}/share/php/baikal/html"; + locations = { + "/" = { + index = "index.php"; + }; + "/.well-known/".extraConfig = '' + rewrite ^/.well-known/caldav /dav.php redirect; + rewrite ^/.well-known/carddav /dav.php redirect; + ''; + "~ /(\.ht|Core|Specific|config)".extraConfig = '' + deny all; + return 404; + ''; + "~ ^(.+\.php)(.*)$".extraConfig = '' + try_files $fastcgi_script_name =404; + include ${config.services.nginx.package}/conf/fastcgi.conf; + fastcgi_split_path_info ^(.+\.php)(.*)$; + fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket}; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + ''; + }; + }; + }; + + users.users.${cfg.user} = lib.mkIf (cfg.user == common-name) { + description = "baikal service user"; + isSystemUser = true; + inherit (cfg) group; + }; + + users.groups.${cfg.group} = lib.mkIf (cfg.group == common-name) { }; + + systemd.tmpfiles.settings."baikal" = builtins.listToAttrs ( + map + (x: { + name = "/var/lib/baikal/${x}"; + value.d = { + mode = "0700"; + inherit (cfg) user group; + }; + }) + [ + "config" + "specific" + "specific/db" + ] + ); + }; +} From ee268921a3fa21b92bd719afd584be6966df9822 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 10:35:47 +0000 Subject: [PATCH 090/240] python312Packages.coiled: 1.90.2 -> 1.90.4 --- pkgs/development/python-modules/coiled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix index e46e38f083cd..b8d5504d66de 100644 --- a/pkgs/development/python-modules/coiled/default.nix +++ b/pkgs/development/python-modules/coiled/default.nix @@ -39,12 +39,12 @@ buildPythonPackage rec { pname = "coiled"; - version = "1.90.2"; + version = "1.90.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-5u33FbSB86jR9KIAhR24J0wSz9kRCaOJ0ituEzULHH8="; + hash = "sha256-wICWij2mdXlV3aYNeK+vITicEKbiuaO2PcZE+h9QDBo="; }; build-system = [ From fef3407120d6cd8e259f4eb3a611e6690be9559c Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 31 Mar 2025 12:45:00 +0200 Subject: [PATCH 091/240] onionshare: use writableTmpDirAsHomeHook --- pkgs/by-name/on/onionshare/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/on/onionshare/package.nix b/pkgs/by-name/on/onionshare/package.nix index d025d96e35a6..640caf9ed2a1 100644 --- a/pkgs/by-name/on/onionshare/package.nix +++ b/pkgs/by-name/on/onionshare/package.nix @@ -15,6 +15,7 @@ versionCheckHook, gitUpdater, onionshare-gui, + writableTmpDirAsHomeHook, }: python3Packages.buildPythonApplication rec { pname = "onionshare-cli"; @@ -95,16 +96,12 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ versionCheckHook + writableTmpDirAsHomeHook ] ++ (with python3Packages; [ pytestCheckHook ]); - preCheck = '' - # Tests use the home directory - export HOME="$(mktemp -d)" - ''; - disabledTests = lib.optionals stdenv.hostPlatform.isLinux [ "test_get_tor_paths_linux" # expects /usr instead of /nix/store From 971422df5b81f2f5dd3882c258e993f7577fde37 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 31 Mar 2025 11:30:00 +0200 Subject: [PATCH 092/240] gops: use finalAttrs pattern and writableTmpDirAsHomeHook --- pkgs/by-name/go/gops/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/go/gops/package.nix b/pkgs/by-name/go/gops/package.nix index 2aeb490fa3f6..0975a213b853 100644 --- a/pkgs/by-name/go/gops/package.nix +++ b/pkgs/by-name/go/gops/package.nix @@ -2,22 +2,23 @@ lib, buildGoModule, fetchFromGitHub, + writableTmpDirAsHomeHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gops"; version = "0.3.28"; src = fetchFromGitHub { owner = "google"; repo = "gops"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-HNM487WSfNWNF31ccDIdotsEG8Mj2C7V85UI47a9drU="; }; vendorHash = "sha256-ptC2G7cXcAjthJcAXvuBqI2ZpPuSMBqzO+gJiyaAUP0="; - preCheck = "export HOME=$(mktemp -d)"; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; meta = with lib; { description = "Tool to list and diagnose Go processes currently running on your system"; @@ -26,4 +27,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ pborzenkov ]; }; -} +}) From b8fc49614bd94e28ba14e9f528b4ec8987a4c6f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 12:06:04 +0000 Subject: [PATCH 093/240] diesel-cli: 2.2.8 -> 2.2.9 --- pkgs/by-name/di/diesel-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index 92b98816e363..902d395b93bc 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -27,16 +27,16 @@ assert lib.assertMsg (lib.elem true [ rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.2.8"; + version = "2.2.9"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-+h5gLhbFxVnEHsFZqkkQe6rUiiZy6oYcF2mnb44VHDU="; + hash = "sha256-rMNCNvc4kLJxgiNqvGk3lTFTguqYnjo9H5ZplC+Wii4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vCdxtrhyIhy3VuLWl7XYysCFecHReHWhAs/BRaBTbrk="; + cargoHash = "sha256-2y2fODciv4NcvvHx1y0NZ6w8DM0QNHUGYSfPz5vVxmY="; nativeBuildInputs = [ installShellFiles From 28fb02b42d33e07f441e4475f8aa0381c2983366 Mon Sep 17 00:00:00 2001 From: Keenan Weaver Date: Wed, 9 Apr 2025 07:23:13 -0500 Subject: [PATCH 094/240] bstone: fix hardware acceleration issues --- pkgs/by-name/bs/bstone/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bs/bstone/package.nix b/pkgs/by-name/bs/bstone/package.nix index f0bf4886ae6f..667d52a09088 100644 --- a/pkgs/by-name/bs/bstone/package.nix +++ b/pkgs/by-name/bs/bstone/package.nix @@ -3,8 +3,7 @@ stdenv, fetchFromGitHub, cmake, - SDL2, - libGL, + sdl2-compat, }: stdenv.mkDerivation (finalAttrs: { @@ -23,8 +22,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - libGL - SDL2 + sdl2-compat ]; postInstall = '' From 9a6297dc5e8197d53fe7aa02ee847babdbfbb628 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 26 Mar 2025 13:53:16 +0100 Subject: [PATCH 095/240] python3Packages.mujoco-mjx: init at 3.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- .../python-modules/mujoco-mjx/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/mujoco-mjx/default.nix diff --git a/pkgs/development/python-modules/mujoco-mjx/default.nix b/pkgs/development/python-modules/mujoco-mjx/default.nix new file mode 100644 index 000000000000..7073dc4484d1 --- /dev/null +++ b/pkgs/development/python-modules/mujoco-mjx/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + + # src / metadata + mujoco-main, + + # build-system + setuptools, + + # dependencies + absl-py, + etils, + importlib-resources, + jax, + jaxlib, + mujoco, + scipy, + trimesh, +}: + +buildPythonPackage { + pname = "mujoco-mjx"; + inherit (mujoco-main) src version; + + pyproject = true; + + sourceRoot = "${mujoco-main.src.name}/mjx"; + + build-system = [ setuptools ]; + + dependencies = [ + absl-py + etils + importlib-resources + jax + jaxlib + mujoco + scipy + trimesh + ] ++ etils.optional-dependencies.epath; + + pythonImportsCheck = [ "mujoco.mjx" ]; + + meta = { + description = "MuJoCo XLA (MJX)"; + inherit (mujoco.meta) homepage changelog license; + maintainers = with lib.maintainers; [ nim65s ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 01db0f0e07f1..704825453925 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10123,6 +10123,8 @@ self: super: with self; { mujoco = callPackage ../development/python-modules/mujoco { inherit (pkgs) mujoco; }; + mujoco-mjx = callPackage ../development/python-modules/mujoco-mjx { mujoco-main = pkgs.mujoco; }; + mujson = callPackage ../development/python-modules/mujson { }; mullvad-api = callPackage ../development/python-modules/mullvad-api { }; From 555d7ca7db059977b7a8150a8950752a2cdaeead Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 26 Mar 2025 12:36:00 +0100 Subject: [PATCH 096/240] python3Packages.brax: init at 0.12.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- .../python-modules/brax/default.nix | 113 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 115 insertions(+) create mode 100644 pkgs/development/python-modules/brax/default.nix diff --git a/pkgs/development/python-modules/brax/default.nix b/pkgs/development/python-modules/brax/default.nix new file mode 100644 index 000000000000..5610ee08f322 --- /dev/null +++ b/pkgs/development/python-modules/brax/default.nix @@ -0,0 +1,113 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + stdenv, + + # build-system + setuptools, + + # dependencies + absl-py, + dm-env, + etils, + flask, + flask-cors, + flax, + grpcio, + gym, + jax, + jaxlib, + jaxopt, + jinja2, + ml-collections, + mujoco, + mujoco-mjx, + numpy, + optax, + orbax-checkpoint, + pillow, + pytinyrenderer, + scipy, + tensorboardx, + trimesh, + + # tests + pytestCheckHook, + pytest-xdist, + transforms3d, +}: + +buildPythonPackage rec { + pname = "brax"; + version = "0.12.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "google"; + repo = "brax"; + tag = "v${version}"; + hash = "sha256-whkkqTTy5CY6soyS5D7hWtBZuVHc6si1ArqwLgzHDkw="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + absl-py + # TODO: remove dm_env after dropping legacy v1 code + dm-env + etils + flask + flask-cors + flax + # TODO: remove grpcio and gym after dropping legacy v1 code + grpcio + gym + jax + jaxlib + jaxopt + jinja2 + ml-collections + mujoco + mujoco-mjx + numpy + optax + orbax-checkpoint + pillow + # TODO: remove pytinyrenderer after dropping legacy v1 code + pytinyrenderer + scipy + tensorboardx + trimesh + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + transforms3d + ]; + + disabledTests = lib.optionals stdenv.hostPlatform.isAarch64 [ + # Flaky: + # AssertionError: Array(-0.00135638, dtype=float32) != 0.0 within 0.001 delta (Array(0.00135638, dtype=float32) difference) + "test_pendulum_period2" + ]; + + disabledTestPaths = [ + # ValueError: matmul: Input operand 1 has a mismatch in its core dimension + "brax/generalized/constraint_test.py" + ]; + + pythonImportsCheck = [ + "brax" + ]; + + meta = { + description = "Massively parallel rigidbody physics simulation on accelerator hardware"; + homepage = "https://github.com/google/brax"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nim65s ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 704825453925..d09c74ea223f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2010,6 +2010,8 @@ self: super: with self; { bravia-tv = callPackage ../development/python-modules/bravia-tv { }; + brax = callPackage ../development/python-modules/brax { }; + breathe = callPackage ../development/python-modules/breathe { }; breezy = callPackage ../development/python-modules/breezy { }; From 95a8624fab3afe16c73eaf7602ef29cc3f2d2104 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 9 Apr 2025 17:06:14 +0200 Subject: [PATCH 097/240] mujoco: passthru test python3Packages.mujoco-mjx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- pkgs/by-name/mu/mujoco/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix index c0bea6fdd240..50bf731bdeae 100644 --- a/pkgs/by-name/mu/mujoco/package.nix +++ b/pkgs/by-name/mu/mujoco/package.nix @@ -184,6 +184,7 @@ stdenv.mkDerivation (finalAttrs: { }; tests = { pythonMujoco = python3Packages.mujoco; + pythonMujocoMjx = python3Packages.mujoco-mjx; }; }; From f33a4d26226c05d501b9d4d3e5e60a3a59991921 Mon Sep 17 00:00:00 2001 From: liberodark Date: Mon, 27 Jan 2025 18:37:29 +0100 Subject: [PATCH 098/240] peertube: move to by-name --- .../peertube/default.nix => by-name/pe/peertube/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{servers/peertube/default.nix => by-name/pe/peertube/package.nix} (99%) diff --git a/pkgs/servers/peertube/default.nix b/pkgs/by-name/pe/peertube/package.nix similarity index 99% rename from pkgs/servers/peertube/default.nix rename to pkgs/by-name/pe/peertube/package.nix index e62bf9005deb..62cf67072afa 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/by-name/pe/peertube/package.nix @@ -10,7 +10,7 @@ fixup-yarn-lock, jq, fd, - nodejs, + nodejs_18, which, yarn, }: @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { fd ]; - buildInputs = [ nodejs ]; + buildInputs = [ nodejs_18 ]; buildPhase = '' # Build node modules diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df389f32233d..55fdf3f29722 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15782,10 +15782,6 @@ with pkgs; stdenv = gccStdenv; }; - peertube = callPackage ../servers/peertube { - nodejs = nodejs_18; - }; - photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { }; phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { }; From 1a076fc58b3a363c956a273036c15b6a2ba68749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 9 Apr 2025 19:51:05 +0200 Subject: [PATCH 099/240] gitea: 1.23.6 -> 1.23.7 Diff: https://github.com/go-gitea/gitea/compare/refs/tags/v1.23.6...refs/tags/v1.23.7 --- pkgs/by-name/gi/gitea/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index 5420ca4ae351..36806807c20e 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -35,13 +35,13 @@ let in buildGoModule rec { pname = "gitea"; - version = "1.23.6"; + version = "1.23.7"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; tag = "v${gitea.version}"; - hash = "sha256-psVny0qmx2wPiNK1qIXQiW0gdRsZs16MEfIgBXTWgFI="; + hash = "sha256-pdmRujcLnQBIQXc26MPpoLbbV00KMaVHPY4xTsitaCA="; }; proxyVendor = true; From 1c1e0be5547c44513fde78a1650714bee5816d59 Mon Sep 17 00:00:00 2001 From: Winter Date: Wed, 9 Apr 2025 14:04:18 -0400 Subject: [PATCH 100/240] wireguard-go: drop redundant ldflag --- pkgs/by-name/wi/wireguard-go/package.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/wi/wireguard-go/package.nix b/pkgs/by-name/wi/wireguard-go/package.nix index b3101b3da3a2..b77c1ea2f827 100644 --- a/pkgs/by-name/wi/wireguard-go/package.nix +++ b/pkgs/by-name/wi/wireguard-go/package.nix @@ -33,10 +33,7 @@ buildGoModule ( subPackages = [ "." ]; - ldflags = [ - "-s" - "-w" - ]; + ldflags = [ "-s" ]; # No tests besides the formatting one are in root. # We can't override subPackages per-phase (and we don't From 0fe5843ab46e89de97f32b65722f373a8a40e536 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 9 Apr 2025 21:23:13 +0200 Subject: [PATCH 101/240] ci: Update pinned Nixpkgs From the nixpkgs-unstable channel: https://hydra.nixos.org/eval/1814458#tabs-inputs --- ci/pinned-nixpkgs.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/pinned-nixpkgs.json b/ci/pinned-nixpkgs.json index c5c558dc61bc..00cd71fab0ab 100644 --- a/ci/pinned-nixpkgs.json +++ b/ci/pinned-nixpkgs.json @@ -1,4 +1,4 @@ { - "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", - "sha256": "0qg99zj0gb0pc6sjlkmwhk1c1xz14qxmk6gamgfmcxpsfdp5vn72" + "rev": "b2b0718004cc9a5bca610326de0a82e6ea75920b", + "sha256": "0aqrxx1w40aqicjhg2057bpyrrbsx6mnii5dp5klpm4labfg2iwi" } From 7b7fb6fb85cb6a42e3ccedac2bc5dc0a0362fa76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 19:45:23 +0000 Subject: [PATCH 102/240] terraform-providers.tencentcloud: 1.81.178 -> 1.81.181 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5d4963c03457..ab06ea4610c2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1309,11 +1309,11 @@ "vendorHash": "sha256-IKoDnClkmcCDFyt9QqWp10vZjfQpWByoUArY+hkXkVE=" }, "tencentcloud": { - "hash": "sha256-DkktMcHU0T9H/jGOq66N7n1bfBF7aDEWGYmQrzWsqr8=", + "hash": "sha256-ZLjCtxR9CPYCcEIlm+cTN1lLhLu8D+BAGEvjzKbQhH8=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.178", + "rev": "v1.81.181", "spdx": "MPL-2.0", "vendorHash": null }, From 0b219bc2b1718ce209ef59fc7d5cdc1ea96cdce4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 19:49:29 +0000 Subject: [PATCH 103/240] gitsign: 0.12.0 -> 0.13.0 --- pkgs/by-name/gi/gitsign/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitsign/package.nix b/pkgs/by-name/gi/gitsign/package.nix index 3fc0d48b32d7..beb12aba56f7 100644 --- a/pkgs/by-name/gi/gitsign/package.nix +++ b/pkgs/by-name/gi/gitsign/package.nix @@ -10,15 +10,15 @@ buildGoModule rec { pname = "gitsign"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-MOj3bpVgeZlsvJqPD5mAud7jSHsRPCKvYAe2aQ4rWcw="; + hash = "sha256-sxkQOqlCgS/QFfRN5Rtdih2zjiGHY6H9Kjlw0Q74W2A="; }; - vendorHash = "sha256-POB8mSGyW45RSbNq9Vp/LW3jEtnHi7zufihXFTnWEfw="; + vendorHash = "sha256-CvswCIczi+MyHsluz39CnfVJEcc49wkEby67qHxv+wI="; subPackages = [ "." From 4e15817226926fe8f5c91b6cb2850be4079aa7cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 20:14:18 +0000 Subject: [PATCH 104/240] cpptrace: 0.8.2 -> 0.8.3 --- pkgs/by-name/cp/cpptrace/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cp/cpptrace/package.nix b/pkgs/by-name/cp/cpptrace/package.nix index 86980c933c0d..0a9b0cc43d51 100644 --- a/pkgs/by-name/cp/cpptrace/package.nix +++ b/pkgs/by-name/cp/cpptrace/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpptrace"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "jeremy-rifkin"; repo = "cpptrace"; tag = "v${finalAttrs.version}"; - hash = "sha256-3BnAWRpKJR5lsokpmbOLUIQGuiH46AM1NQwOtBl28AA="; + hash = "sha256-oFwRFFDLl4/3szVj/ge8cSrpuuHEzf4VsCPGTE0dxRc="; }; nativeBuildInputs = [ From 2b95ebd81cb0f4d8c8e2a6fc71f566e4e0152aaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 20:16:32 +0000 Subject: [PATCH 105/240] heptabase: 1.54.0 -> 1.55.1 --- pkgs/by-name/he/heptabase/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix index 6f6e1bb4d91f..a196dcfd7310 100644 --- a/pkgs/by-name/he/heptabase/package.nix +++ b/pkgs/by-name/he/heptabase/package.nix @@ -5,10 +5,10 @@ }: let pname = "heptabase"; - version = "1.54.0"; + version = "1.55.1"; src = fetchurl { url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-wn/HYtwOdP5n5GVJgNWjeujwhDAYE8PfK84JcuJjOwg="; + hash = "sha256-m18EUpcxUW5hyhFYLhHZqIEStqzsyss7T4TelAjw/eQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 28857bf83da0db902b391eb8bac1528fddfd1289 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 20:53:46 +0000 Subject: [PATCH 106/240] mise: 2025.3.11 -> 2025.4.1 --- pkgs/by-name/mi/mise/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index 29355753f408..7e1498c91c1d 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -23,17 +23,17 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2025.3.11"; + version = "2025.4.1"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-n7A6LGjcVz6LWz8fkkG5XS2WZf3FFkbidnt/S5jxy5g="; + hash = "sha256-WEzf091KJbXTsyCNaz2QdiNklPZ3054jATGkl5Y+6lA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-On2+ROA71RyZdFPvH4Zem/494Q4uCYS4EZSvQL1DDWQ="; + cargoHash = "sha256-N04vcOJjx0GCKYXJCkQFQT4D8WWJsi62f3cdUW+4zMk="; nativeBuildInputs = [ installShellFiles From 45899eb42bb72aea2309a275b43c8290004a69b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 21:22:38 +0000 Subject: [PATCH 107/240] hatch: 1.14.0 -> 1.14.1 --- pkgs/by-name/ha/hatch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix index bbd0316aa075..2a26b7173f88 100644 --- a/pkgs/by-name/ha/hatch/package.nix +++ b/pkgs/by-name/ha/hatch/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "hatch"; - version = "1.14.0"; + version = "1.14.1"; pyproject = true; src = fetchFromGitHub { owner = "pypa"; repo = "hatch"; tag = "hatch-v${version}"; - hash = "sha256-JwFPNoFoNqAXkLCGhliLN98VAS+VCwRzo+JqWLIrxsw="; + hash = "sha256-101R5x4jAfMYrdE3OWWqGmkPWRI9rSMYr+Lye9NCbA4="; }; patches = [ (replaceVars ./paths.patch { uv = lib.getExe python3Packages.uv; }) ]; From 0ad325e92db34d2b082e654bedf616c0eab0b52b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 21:29:05 +0000 Subject: [PATCH 108/240] treesheets: 0-unstable-2025-03-28 -> 0-unstable-2025-04-05 --- pkgs/by-name/tr/treesheets/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/treesheets/package.nix b/pkgs/by-name/tr/treesheets/package.nix index efec437d0b53..ba8766e6f068 100644 --- a/pkgs/by-name/tr/treesheets/package.nix +++ b/pkgs/by-name/tr/treesheets/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2025-03-28"; + version = "0-unstable-2025-04-05"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "316918fd20bd1edab2f5ae8c18555537f7f9057b"; - hash = "sha256-/z4qyISw41W1pQCrmXc9a9gCc4Unc1XM2EEFGZZLlAU="; + rev = "f42f3883dd98cb40d90a891d662c9ee9181089bf"; + hash = "sha256-+wHsWAaG9UvPHiSIKy93vUpi5gWiDeGmXis+EGaQqZ0="; }; nativeBuildInputs = [ From 595fa9e0679226a5b222b5d1504be58e91230d4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 21:53:46 +0000 Subject: [PATCH 109/240] tproxy: 0.8.1 -> 0.9.0 --- pkgs/by-name/tp/tproxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tp/tproxy/package.nix b/pkgs/by-name/tp/tproxy/package.nix index 0164664ace17..451fb3d0a35f 100644 --- a/pkgs/by-name/tp/tproxy/package.nix +++ b/pkgs/by-name/tp/tproxy/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tproxy"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "kevwan"; repo = "tproxy"; tag = "v${version}"; - hash = "sha256-LX3ciC3cMYuQPm6ekEkJPrSdTXH+WZ4flXyrsvJZgn8="; + hash = "sha256-LiYZ9S7Jga4dQWHmqsPvlGDAAw5reO16LAYaNJZFnhE="; }; - vendorHash = "sha256-7s2gnd9UR/R7H5pcA8NcoenaabSVpMh3qzzkOr5RWnU="; + vendorHash = "sha256-YjkYb5copw0SM2lago+DyVgHIrqLDSBnO+4zLMq+YJ8="; ldflags = [ "-w" From c6091599d447d0f54101303bda11dacbadbb4886 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 21:57:47 +0000 Subject: [PATCH 110/240] oneanime: 1.3.9 -> 1.4.0 --- pkgs/by-name/on/oneanime/package.nix | 4 ++-- pkgs/by-name/on/oneanime/pubspec.lock.json | 26 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/on/oneanime/package.nix b/pkgs/by-name/on/oneanime/package.nix index bb60b17aa484..9a01cf6c8344 100644 --- a/pkgs/by-name/on/oneanime/package.nix +++ b/pkgs/by-name/on/oneanime/package.nix @@ -60,13 +60,13 @@ let in flutter329.buildFlutterApplication rec { pname = "oneanime"; - version = "1.3.9"; + version = "1.4.0"; src = fetchFromGitHub { owner = "Predidit"; repo = "oneAnime"; tag = version; - hash = "sha256-7W+/Au3NJLO6lv8AZ0T+vs9bb+qgUV0Sz4qZSl7gR6c="; + hash = "sha256-1rNnJF16YEj6akq4jtIzI2skl/qxYgi/VQSeo1J87JM="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/on/oneanime/pubspec.lock.json b/pkgs/by-name/on/oneanime/pubspec.lock.json index f866afae398f..47aa1d0581f0 100644 --- a/pkgs/by-name/on/oneanime/pubspec.lock.json +++ b/pkgs/by-name/on/oneanime/pubspec.lock.json @@ -180,11 +180,11 @@ "dependency": "direct main", "description": { "name": "canvas_danmaku", - "sha256": "a6761973c72328c3872fa288d0a943bf3675238a30913cf9cd0155d9b7cea9ca", + "sha256": "98fd90f257ffe93bd6a0bd857d92f40172767fc77ffb48b2379ac692e62150eb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.6" + "version": "0.2.7" }, "characters": { "dependency": "transitive", @@ -806,7 +806,7 @@ "description": { "path": "media_kit", "ref": "main", - "resolved-ref": "d8eb365f7e957020f68309214e142fc527b855c7", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -817,7 +817,7 @@ "description": { "path": "libs/android/media_kit_libs_android_video", "ref": "main", - "resolved-ref": "d8eb365f7e957020f68309214e142fc527b855c7", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -828,7 +828,7 @@ "description": { "path": "libs/ios/media_kit_libs_ios_video", "ref": "main", - "resolved-ref": "d8eb365f7e957020f68309214e142fc527b855c7", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -839,7 +839,7 @@ "description": { "path": "libs/linux/media_kit_libs_linux", "ref": "main", - "resolved-ref": "d8eb365f7e957020f68309214e142fc527b855c7", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -850,7 +850,7 @@ "description": { "path": "libs/macos/media_kit_libs_macos_video", "ref": "main", - "resolved-ref": "d8eb365f7e957020f68309214e142fc527b855c7", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -861,7 +861,7 @@ "description": { "path": "libs/universal/media_kit_libs_video", "ref": "main", - "resolved-ref": "d8eb365f7e957020f68309214e142fc527b855c7", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -872,7 +872,7 @@ "description": { "path": "libs/windows/media_kit_libs_windows_video", "ref": "main", - "resolved-ref": "d8eb365f7e957020f68309214e142fc527b855c7", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -883,7 +883,7 @@ "description": { "path": "media_kit_video", "ref": "main", - "resolved-ref": "d8eb365f7e957020f68309214e142fc527b855c7", + "resolved-ref": "aef901f6abc9192aa74bf05036c2f520cebf3259", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1699,11 +1699,11 @@ "dependency": "transitive", "description": { "name": "wakelock_plus", - "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e", + "sha256": "b90fbcc8d7bdf3b883ea9706d9d76b9978cb1dfa4351fcc8014d6ec31a493354", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.10" + "version": "1.2.11" }, "wakelock_plus_platform_interface": { "dependency": "transitive", @@ -1828,6 +1828,6 @@ }, "sdks": { "dart": ">=3.7.0 <4.0.0", - "flutter": ">=3.29.1" + "flutter": ">=3.29.2" } } From 4c1684a81e61f3eac5334ea26c2fd7c7ef976f1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 22:02:42 +0000 Subject: [PATCH 111/240] granian: 2.2.2 -> 2.2.3 --- pkgs/development/python-modules/granian/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix index 617ebed8a2d3..38c0097966de 100644 --- a/pkgs/development/python-modules/granian/default.nix +++ b/pkgs/development/python-modules/granian/default.nix @@ -19,19 +19,19 @@ buildPythonPackage rec { pname = "granian"; - version = "2.2.2"; + version = "2.2.3"; pyproject = true; src = fetchFromGitHub { owner = "emmett-framework"; repo = "granian"; tag = "v${version}"; - hash = "sha256-LIJhhekulLQje6/8g9BIraH8aToPVWoTnWnmgtwLnHA="; + hash = "sha256-E0ooMXqR6PR6JVHEjiqsVaxsMs5ZIoR5YAmExF73ljI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-GSPGDVn4WlTJY9CiToI6myuiLcV1j2+LYD9IusDtgUg="; + hash = "sha256-XXgg2HW4SNINeoG1zU/bqpplP6UdQOE2z68rvB4vA/0="; }; nativeBuildInputs = with rustPlatform; [ From 79123eb0af2348d4ad354ef645c0e7c9d45eb25f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 22:12:09 +0000 Subject: [PATCH 112/240] lua-language-server: 3.13.9 -> 3.14.0 --- pkgs/by-name/lu/lua-language-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix index 187416f3fb2e..b9b97d323603 100644 --- a/pkgs/by-name/lu/lua-language-server/package.nix +++ b/pkgs/by-name/lu/lua-language-server/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.13.9"; + version = "3.14.0"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; tag = finalAttrs.version; - hash = "sha256-zttTtMAeBsHBqgDm3CAvp54Tp2bfQUhk5/lKgKWUeJY="; + hash = "sha256-+pxDCjBcNYpSGZJpwJhL/PsARNhqdIXRHKj9DQvOyLE="; fetchSubmodules = true; }; From cb3f84f112532641f48356d945837080f8a62553 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 22:39:22 +0000 Subject: [PATCH 113/240] terraform-providers.yandex: 0.139.0 -> 0.140.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5d4963c03457..15f20faee315 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1481,12 +1481,12 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-NPwDdTHKvQVfGDfR0kv0KvjJrjiRs8JcPtMcb3qcm5k=", + "hash": "sha256-x2oPz2J1b0Hp/LqLv88cUS+XWvnbHBrXILlK0emtHd0=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.139.0", + "rev": "v0.140.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-2UnAigHaUj1d1UV/bsLnf2MF1I26N6242n6O8xh7U1s=" + "vendorHash": "sha256-y8siBGsl9b5s+XWNfhue1VF6FZ2AwhFIVm1eIkqqxzo=" } } From e6b11fe5ef7d3b70e6425a033c8105f5ebe76df6 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Wed, 9 Apr 2025 22:47:18 +0000 Subject: [PATCH 114/240] freebsd.source: Use hashes from `git archive` An in-tree dependency of FreeBSD uses an `export-ignore` directive to hide certain files from the git export. Unfortunately, that means that `fetchFromGitHub` has different outputs when `forceFetchGit = true` and `forceFetchGit = false`. We cannot download source with git during native FreeBSD bootstrap due to a circular dependency, so change the update script to output archives matching GitHub. --- pkgs/os-specific/bsd/freebsd/pkgs/source.nix | 12 ++-- pkgs/os-specific/bsd/freebsd/update.py | 61 +++++++++----------- pkgs/os-specific/bsd/freebsd/versions.json | 20 +++---- 3 files changed, 42 insertions(+), 51 deletions(-) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/source.nix b/pkgs/os-specific/bsd/freebsd/pkgs/source.nix index 9e1c4032ad61..4aee3af27ffa 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/source.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/source.nix @@ -1,16 +1,12 @@ { fetchFromGitHub, sourceData }: -# Using fetchFromGitHub from their mirror because it's a lot faster than their git server -# If you want you could fetchgit from "https://git.FreeBSD.org/src.git" instead. +# Using fetchFromGitHub from their mirror because we cannot use git during bootstrap +# If you want you could fetchurl from "https://cgit.FreeBSD.org/src" instead. # The update script still pulls directly from git.freebsd.org +# Note that hashes with `forceFetchGit = true` may be different due to `export-ignore` +# directives in gitattributes files. fetchFromGitHub { owner = "freebsd"; repo = "freebsd-src"; inherit (sourceData) rev hash; - - # The GitHub export excludes some files in the git source - # that were marked `export-ignore`. - # A normal git checkout will keep those files, - # matching the update script - forceFetchGit = true; } diff --git a/pkgs/os-specific/bsd/freebsd/update.py b/pkgs/os-specific/bsd/freebsd/update.py index 533a871a4b04..f6a7911e7e75 100755 --- a/pkgs/os-specific/bsd/freebsd/update.py +++ b/pkgs/os-specific/bsd/freebsd/update.py @@ -11,12 +11,13 @@ import pandas import re import subprocess import sys +import tarfile import tempfile import typing import urllib.request _QUERY_VERSION_PATTERN = re.compile('^([A-Z]+)="(.+)"$') -_RELEASE_PATCH_PATTERN = re.compile('^RELEASE-p([0-9]+)$') +_RELEASE_PATCH_PATTERN = re.compile("^RELEASE-p([0-9]+)$") BASE_DIR = os.path.dirname(os.path.abspath(__file__)) MIN_VERSION = packaging.version.Version("13.0.0") MAIN_BRANCH = "main" @@ -32,7 +33,7 @@ BRANCH_PATTERN = re.compile( def request_supported_refs() -> list[str]: # Looks pretty shady but I think this should work with every version of the page in the last 20 years - r = re.compile("^h\d$", re.IGNORECASE) + r = re.compile(r"^h\d$", re.IGNORECASE) soup = bs4.BeautifulSoup( urllib.request.urlopen("https://www.freebsd.org/security"), features="lxml" ) @@ -45,11 +46,11 @@ def request_supported_refs() -> list[str]: return list(df["Branch"]) -def query_version(repo: git.Repo) -> dict[str, typing.Any]: +def query_version(work_dir: str) -> dict[str, typing.Any]: # This only works on FreeBSD 13 and later text = ( subprocess.check_output( - ["bash", os.path.join(repo.working_dir, "sys", "conf", "newvers.sh"), "-v"] + ["bash", os.path.join(work_dir, "sys", "conf", "newvers.sh"), "-v"] ) .decode("utf-8") .strip() @@ -86,18 +87,23 @@ def handle_commit( print(f"{ref_name}: revision still {rev.hexsha}, skipping") return old_versions[ref_name] - repo.git.checkout(rev) - print(f"{ref_name}: checked out {rev.hexsha}") + tar_content = io.BytesIO() + repo.archive(tar_content, rev, format="tar") + tar_content.seek(0) - full_hash = ( - subprocess.check_output(["nix", "hash", "path", "--sri", repo.working_dir]) - .decode("utf-8") - .strip() - ) - print(f"{ref_name}: hash is {full_hash}") + with tempfile.TemporaryDirectory(dir="/tmp") as work_dir: + file = tarfile.TarFile(fileobj=tar_content) + file.extractall(path=work_dir, filter="data") - version = query_version(repo) - print(f"{ref_name}: version is {version['version']}") + full_hash = ( + subprocess.check_output(["nix", "hash", "path", "--sri", work_dir]) + .decode("utf-8") + .strip() + ) + print(f"{ref_name}: hash is {full_hash}") + + version = query_version(work_dir) + print(f"{ref_name}: version is {version['version']}") return { "rev": rev.hexsha, @@ -115,30 +121,19 @@ def main() -> None: print(f"Selected temporary directory {temp_dir.name}") if len(sys.argv) >= 2: - orig_repo = git.Repo(sys.argv[1]) - print(f"Fetching updates on {orig_repo.git_dir}") - orig_repo.remote("origin").fetch() + repo = git.Repo(sys.argv[1]) + print(f"Fetching updates on {repo.git_dir}") + repo.remote("origin").fetch() else: print("Cloning source repo") - orig_repo = git.Repo.clone_from( - "https://git.FreeBSD.org/src.git", to_path=os.path.join(temp_dir.name, "orig") + repo = git.Repo.clone_from( + "https://git.FreeBSD.org/src.git", to_path=temp_dir.name ) supported_refs = request_supported_refs() print(f"Supported refs are: {' '.join(supported_refs)}") - print("Doing git crimes, do not run `git worktree prune` until after script finishes!") - workdir = os.path.join(temp_dir.name, "work") - git.cmd.Git(orig_repo.git_dir).worktree("add", "--orphan", workdir) - - # Have to create object before removing .git otherwise it will complain - repo = git.Repo(workdir) - repo.git.set_persistent_git_options(git_dir=repo.git_dir) - # Remove so that nix hash doesn't see the file - os.remove(os.path.join(workdir, ".git")) - - print(f"Working in directory {repo.working_dir} with git directory {repo.git_dir}") - + print(f"git directory {repo.git_dir}") try: with open(os.path.join(BASE_DIR, "versions.json"), "r") as f: @@ -191,10 +186,10 @@ def main() -> None: ) versions[fullname] = result - with open(os.path.join(BASE_DIR, "versions.json"), "w") as out: json.dump(versions, out, sort_keys=True, indent=2) out.write("\n") -if __name__ == '__main__': + +if __name__ == "__main__": main() diff --git a/pkgs/os-specific/bsd/freebsd/versions.json b/pkgs/os-specific/bsd/freebsd/versions.json index e8c3c7ec80c5..eefea201ebe9 100644 --- a/pkgs/os-specific/bsd/freebsd/versions.json +++ b/pkgs/os-specific/bsd/freebsd/versions.json @@ -1,15 +1,15 @@ { "main": { - "hash": "sha256-xsgY5Ex/B5ngOTa5OZRauSaSYvET5lWI7veJRrSq1oY=", + "hash": "sha256-f69U2FX+3GQimdUJunWApFseeKJhzjgNw4h26ZBPiT0=", "ref": "main", "refType": "branch", - "rev": "c5773d366ecc5271b9bd6e5506c00fb3520f19ae", + "rev": "9357c694e8dca627c25b15529e8435b2ab3dd48b", "supported": false, "version": { "branch": "CURRENT", "major": 15, "minor": 0, - "reldate": "1500035", + "reldate": "1500036", "release": "15.0-CURRENT", "revision": "15.0", "type": "FreeBSD", @@ -161,7 +161,7 @@ } }, "release/14.2.0": { - "hash": "sha256-qZkeuUZbuPOvXZBgP5x6Hii1YN7XdDJzwZeYacIR5BI=", + "hash": "sha256-q5/0pKRlmzZUN+VMwUImkve+NTT1+O68YlwgXp2/aQM=", "ref": "release/14.2.0", "refType": "tag", "rev": "c8918d6c7412fce87922e9bd7e4f5c7d7ca96eb7", @@ -308,7 +308,7 @@ "ref": "releng/14.1", "refType": "branch", "rev": "f389e68ca980b7e053a34d9eddde89b4c2a1ee6c", - "supported": true, + "supported": false, "version": { "branch": "RELEASE-p8", "major": 14, @@ -322,7 +322,7 @@ } }, "releng/14.2": { - "hash": "sha256-XP8BFnXvziaC9wOJj8q31UZXFqCUE7WQ5FdJHEZWGbg=", + "hash": "sha256-iSeTif/cEkqhIQ5hSNF+Rx7dORU13Bc0Dk8Zv4TYWtA=", "ref": "releng/14.2", "refType": "branch", "rev": "ac2cbb46b5f1efa7f7b5d4eb15631337329ec5b2", @@ -340,10 +340,10 @@ } }, "stable/13": { - "hash": "sha256-J9SJKeR6Den3Sep2o4r0cqIDd2V5gbY0Ow9eP69Ny0o=", + "hash": "sha256-rex3CUXyyNDz/TouNqlzZFo6DAwSOKXTdC5HaRQoKKc=", "ref": "stable/13", "refType": "branch", - "rev": "a8431b47adae8f8b731206dc38d82b2245ad245e", + "rev": "64f5a71c1cb79c09e50a37ddbe958224bb64add4", "supported": true, "version": { "branch": "STABLE", @@ -357,10 +357,10 @@ } }, "stable/14": { - "hash": "sha256-tleB6J5Cg1SIN2LCfvV3Cfp4Lxx65UHmiILpin6UYGY=", + "hash": "sha256-s+pj8LttAnKNNohUsJNOJRFmLg6x06tlkJn3xQnFQiY=", "ref": "stable/14", "refType": "branch", - "rev": "6e510d8fbaf8d91da235fe28250cd48124edda9f", + "rev": "e6a470ffcbd708cf404472bb871c2cb76eaa7b39", "supported": true, "version": { "branch": "STABLE", From 3095a14cf03c9ca2917a0e18ae51d8acb58677e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 22:56:20 +0000 Subject: [PATCH 115/240] pdi: 1.8.3 -> 1.9.0 --- pkgs/by-name/pd/pdi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pd/pdi/package.nix b/pkgs/by-name/pd/pdi/package.nix index a759cf478556..3e78fa6de6c9 100644 --- a/pkgs/by-name/pd/pdi/package.nix +++ b/pkgs/by-name/pd/pdi/package.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "pdi"; - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "pdidev"; repo = "pdi"; tag = finalAttrs.version; - hash = "sha256-oiHkCXQZGeijoJf8XpbBPdxmxClWyCsnv6laDdMXk6U="; + hash = "sha256-eWBbhHBDS2NbY74vbeD/+UDdpam4XiX7loYb1chjryo="; }; # Current hdf5 version in nixpkgs is 1.14.4.3 which is 4 numbers long and doesn't match the 3 number regex. :') From 7a1e393d4bcf1d493aae404ff5267b4fe480a182 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 23:09:05 +0000 Subject: [PATCH 116/240] kubevpn: 2.4.2 -> 2.6.0 --- pkgs/by-name/ku/kubevpn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix index dda318d49bd0..52ae0876068f 100644 --- a/pkgs/by-name/ku/kubevpn/package.nix +++ b/pkgs/by-name/ku/kubevpn/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.4.2"; + version = "2.6.0"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - hash = "sha256-E/1MV/EjG9MU2xiCFC0jAvIwSAfyNCrhKcfedH5DPN0="; + hash = "sha256-P01hjVAA3h/TBPl8q9KuZoE5xWAhmJ5E2nFSuvfWIIg="; }; vendorHash = null; From 13c002a308259a2427255d45132a9d6548d55f9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 23:40:01 +0000 Subject: [PATCH 117/240] tlafmt: 0.4.0 -> 0.4.1 --- pkgs/by-name/tl/tlafmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tl/tlafmt/package.nix b/pkgs/by-name/tl/tlafmt/package.nix index 67871bfc951f..05366eb1b1ce 100644 --- a/pkgs/by-name/tl/tlafmt/package.nix +++ b/pkgs/by-name/tl/tlafmt/package.nix @@ -5,18 +5,18 @@ }: rustPlatform.buildRustPackage rec { pname = "tlafmt"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "domodwyer"; repo = "tlafmt"; tag = "v${version}"; - hash = "sha256-wZ0irWf9S4abcT1BvODFAQks9E6BO0gr43ibnSAxddo="; + hash = "sha256-79tCH4O7VFqiYloCAGVw7JJ5WvsFnjjKdBNmMPar+sk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-UAYajXmKPg9Ow3iRqcEhT50YP+i4ZKWOHTTrYR1SzhI="; + cargoHash = "sha256-79eI2POpYr7nUThsWohetEzG17JAxMOVul5soJxYYms="; meta = { description = "Formatter for TLA+ specs"; From dd1d5cfd7064a0df598e68fe48ed1310d0afe1c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 23:40:05 +0000 Subject: [PATCH 118/240] pixelflasher: 7.11.2.1 -> 7.11.3.0 --- pkgs/by-name/pi/pixelflasher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pi/pixelflasher/package.nix b/pkgs/by-name/pi/pixelflasher/package.nix index 352ff0f65d1f..e9adadbc9728 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.2.1"; + version = "7.11.3.0"; format = "other"; src = fetchFromGitHub { owner = "badabing2005"; repo = "PixelFlasher"; tag = "v${version}"; - hash = "sha256-FW5Ve95Po0GoQCLhSVgBR20mVA1Hh9GUDeq2VbziVBQ="; + hash = "sha256-8ZtzOUoD2f25oYFQ+Q3uwG1w1o768361efh3K8L4ZGM="; }; desktopItems = [ From 26d19d18dabc4869b2516642e430667213a7fbbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 10 Apr 2025 01:49:26 +0200 Subject: [PATCH 119/240] hedgedoc: 1.10.2 -> 1.10.3 Diff: https://github.com/hedgedoc/hedgedoc/compare/refs/tags/1.10.2...refs/tags/1.10.3 https://hedgedoc.org/releases/1.10.3/ https://github.com/hedgedoc/hedgedoc/security/advisories/GHSA-3983-rrqh-mvx5 --- pkgs/by-name/he/hedgedoc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/he/hedgedoc/package.nix b/pkgs/by-name/he/hedgedoc/package.nix index 460b44b2062f..700bbe3abe2d 100644 --- a/pkgs/by-name/he/hedgedoc/package.nix +++ b/pkgs/by-name/he/hedgedoc/package.nix @@ -13,13 +13,13 @@ }: let - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "hedgedoc"; repo = "hedgedoc"; tag = version; - hash = "sha256-WDLcBnqhoKt6E41CzumOZg/5qvKFccN6gwirLTcwWYo="; + hash = "sha256-hXcPcGj+efvRVt3cHQc9KttE0/DOD9Bul6f3cY4ofgs="; }; # we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles @@ -44,7 +44,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-u/t2uvQ9oJnfjkSoPGjGsESWIsQHWvj9GP08aD6RkJk="; + outputHash = "sha256-KTUj1O2AA1qTQOqTbGBPLHAgiG5sG832Na8qLvEccmc="; }; in From e8ae060ec9b218d69f6e3ed5e3894d788a477820 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 00:03:07 +0000 Subject: [PATCH 120/240] intentrace: 0.7.4 -> 0.8.0 --- pkgs/by-name/in/intentrace/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/intentrace/package.nix b/pkgs/by-name/in/intentrace/package.nix index 04765846eb76..79c51be8f854 100644 --- a/pkgs/by-name/in/intentrace/package.nix +++ b/pkgs/by-name/in/intentrace/package.nix @@ -5,7 +5,7 @@ }: let - version = "0.7.4"; + version = "0.8.0"; in rustPlatform.buildRustPackage { inherit version; @@ -15,11 +15,11 @@ rustPlatform.buildRustPackage { owner = "sectordistrict"; repo = "intentrace"; tag = "v${version}"; - hash = "sha256-QmHGi8gSXccakvbFNMCCo/5m9BTgXqlLhh4DZxs30iw="; + hash = "sha256-ONOYxtY4e+lxjp1nQ7L8O0xwhEqS3f56KmDFtNo4s80="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mvchd2LA2PUPDFQ3e0dmpMITmRL+wCxp8kLDo9fG/js="; + cargoHash = "sha256-EyOCs7PpsTd2NQbqcXb4ZlZPPTvHQlraxy5liTA2hcE="; meta = { description = "Prettified Linux syscall tracing tool (like strace)"; From db305a78b79dd05ef6099e1b1f3cb33f3a012da4 Mon Sep 17 00:00:00 2001 From: Thomas Berryhill Date: Fri, 4 Apr 2025 23:10:29 -0400 Subject: [PATCH 121/240] dotnetCorePackages.combinePackages: add "metadata" to linked paths This enables users of `dotnetCorePackages.combinePackages` to install .NET workloads. --- pkgs/development/compilers/dotnet/combine-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index d040faab1069..f755c1065410 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -26,6 +26,7 @@ mkWrapper "sdk" ( paths = dotnetPackages; pathsToLink = map (x: "/share/dotnet/${x}") [ "host" + "metadata" "packs" "sdk" "sdk-manifests" From f0c398f156d35be2275f266fa379409a018530d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 00:34:37 +0000 Subject: [PATCH 122/240] ghostfolio: 2.148.0 -> 2.150.0 --- pkgs/by-name/gh/ghostfolio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index 92af0fc0432b..07ff98dce31e 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.148.0"; + version = "2.150.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-cQEqp884yHhVGM6xAXGpB56rxCMHD3R5E1qGXqaHSfQ="; + hash = "sha256-6XoOv1ynZomcWS156DybhfDlrThi3tepqNTtw/1M/zU="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -27,7 +27,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-gMTlZUmcKkD2udlJif8DxTDVhqpgjmWoTh3GmoW+eVo="; + npmDepsHash = "sha256-bLy+5hHyZDnSJ+IH3DPECScaRsXgPNr5ttuHfCpn5kU="; nativeBuildInputs = [ prisma From 092ed5a51c23c421242a258d66ced6ccf60a3056 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 00:37:59 +0000 Subject: [PATCH 123/240] pyenv: 2.5.4 -> 2.5.5 --- pkgs/by-name/py/pyenv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pyenv/package.nix b/pkgs/by-name/py/pyenv/package.nix index b74b3ced1f31..47f9639e761e 100644 --- a/pkgs/by-name/py/pyenv/package.nix +++ b/pkgs/by-name/py/pyenv/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; tag = "v${version}"; - hash = "sha256-8+e4kZoJ/dvx5X/JSlvtEzXiGZJmbtxSnWC1Z0YHtic="; + hash = "sha256-6Cl/St+PN4WmVNurw/bxbw0piqcoijxOfBCfDA6jyTk="; }; nativeBuildInputs = [ From 3c729eac51254b111343c28d97c692d90222113f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 00:39:07 +0000 Subject: [PATCH 124/240] cargo-release: 0.25.17 -> 0.25.18 --- pkgs/by-name/ca/cargo-release/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix index 7f8baef63270..8e91c3c5bb22 100644 --- a/pkgs/by-name/ca/cargo-release/package.nix +++ b/pkgs/by-name/ca/cargo-release/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.25.17"; + version = "0.25.18"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; tag = "v${version}"; - hash = "sha256-SFuEcku6NZlOqLVYrlCJB+ofa8WaL9HJzJcZ42uJ434="; + hash = "sha256-1CHUkXjb8+wOFQWo/04KcLaJcv/dLiDYwPrSnzWucXI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-663u8pUnMlUE/6+1WitbLJlJjtLKohns4FM5Iup/WzU="; + cargoHash = "sha256-ESaESon1oJAlvsv6+TIb/lLsOQmjgheQWm82Lr0mJOE="; nativeBuildInputs = [ pkg-config From a171e7c654b4aa9136ed3e97f868e33ab5605da5 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 10 Apr 2025 02:55:04 +0200 Subject: [PATCH 125/240] ungoogled-chromium: 135.0.7049.52-1 -> 135.0.7049.84-1 https://chromereleases.googleblog.com/2025/04/stable-channel-update-for-desktop_8.html This update includes 2 security fixes. CVEs: CVE-2025-3066 --- .../networking/browsers/chromium/info.json | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 4db78372a890..bc38c109d23a 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -787,7 +787,7 @@ } }, "ungoogled-chromium": { - "version": "135.0.7049.52", + "version": "135.0.7049.84", "deps": { "depot_tools": { "rev": "85ec2718b5a29990c7eb67778348c9f76a00f392", @@ -798,16 +798,16 @@ "hash": "sha256-8NynNvLNCHxy8EYmsnPovKhXu9DcDcYBhg4A6d2QIfY=" }, "ungoogled-patches": { - "rev": "135.0.7049.52-1", - "hash": "sha256-i7fSJsbuXgzDvh/4RJwHvVEalS134SoRzvcJZbYsIIo=" + "rev": "135.0.7049.84-1", + "hash": "sha256-Cncp+sLFWC8nuepXCbkeHZYgAw2cFIAIaQe9wgun/AA=" }, "npmHash": "sha256-wNrZaugdKJCyV1WchkKXzr/I1OW1AtjiC2p7qTZZOqU=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "9ba7e609d28c509a8ce9265c2247065d8d251173", - "hash": "sha256-PjvfckdlaMq9HWefGxFppgBumlqh7xoCoxYFwk/r630=", + "rev": "6c019e56001911b3fd467e03bf68c435924d62f4", + "hash": "sha256-BFw1o2cIHBeBudeigH6YTOuLGsp/+pTOeE1lXBO3aio=", "recompress": true }, "src/third_party/clang-format/script": { @@ -912,8 +912,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "bdc68b25b620d7302a955e2c38c548ebfe74ef31", - "hash": "sha256-R9SQiKUjLkLmPJwuWpw7fcibrWxSlXWkDsCra7Ci0UQ=" + "rev": "53dfda5e9d07d58b43cea66b8153c55dd751ff88", + "hash": "sha256-zXxJZz2C4eDJ8beHDXJe0UCNesDw5R0ogFcsdiF8VIc=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -1402,8 +1402,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "b99f146a03d3c98049768fd91c2bbe6594b02b2c", - "hash": "sha256-tl1GDmcStkuKMmzzsYuRG6Nrk4xDqgYYBoa1VsQNOwY=" + "rev": "6e445bdea696eb6b6a46681dfc1a63edaa517edb", + "hash": "sha256-mSup6nKsEPjJ/HBV7PwjBI4PP7/RdwFm/dnavKeRqzI=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -1492,8 +1492,8 @@ }, "src/third_party/wasm_tts_engine/src": { "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine", - "rev": "6ab3e63276a2d66ba3e7db4f87c5b7cb00e22130", - "hash": "sha256-ZcnKKnHsN1UyztAXClc2EUwfeX3yuLtMM2Zjwpnh62U=" + "rev": "53d2aba6f0cf7db57e17edfc3ff6471871b0c125", + "hash": "sha256-t5eeehwspRLaowEMPLa8/lV5AHamXQBfH/un0DHLVAM=" }, "src/third_party/wayland/src": { "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", @@ -1537,8 +1537,8 @@ }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "04413d62f754a7b1a3a2d8c3df23bcde040112b2", - "hash": "sha256-sFoBgpPeMJQNSjNp8dDEUlB/7lJUpIXTpu0eRq94cGk=" + "rev": "9e5db68b15087eccd8d2493b4e8539c1657e0f75", + "hash": "sha256-gXdBDo+fzp6hJB8qyhscV7ajwSfCUeYvSxhL10g56rU=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", From 879d4f0e73e9a9f4fccb8875c9c7fe190bba8142 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 01:12:03 +0000 Subject: [PATCH 126/240] auth0-cli: 1.10.1 -> 1.11.0 --- pkgs/by-name/au/auth0-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix index 1a3018e39b4a..1d37501620a8 100644 --- a/pkgs/by-name/au/auth0-cli/package.nix +++ b/pkgs/by-name/au/auth0-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "auth0-cli"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; tag = "v${version}"; - hash = "sha256-6JWruZahA3Stu89FGOH2vF6L4wi5CJmqPjJ6fcRkaMY="; + hash = "sha256-iLq316kCCk8Z4eOufbmeYi8tzSelUlwu/Q+h6j1ZMHk="; }; - vendorHash = "sha256-mW7eu8Va8XyV4hD4qkM86LvQhLGWirU+L5UKNvgQIFo="; + vendorHash = "sha256-bWirZgmgL/zZzT14X/VcpUN/lk3WRRJ+vbsabmjXznk="; ldflags = [ "-s" From 2de042325d381a4d0ec2674ccb0193d053d63dba Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 9 Apr 2025 17:42:04 -0500 Subject: [PATCH 127/240] yaziPlugins: add updateScript Checks if the packaged yazi version supports the plugin's required version before updating derivation. Co-authored-by: LazilyStableProton --- pkgs/by-name/ya/yazi/plugins/default.nix | 16 +++ pkgs/by-name/ya/yazi/plugins/update.sh | 141 +++++++++++++++++++++++ 2 files changed, 157 insertions(+) create mode 100755 pkgs/by-name/ya/yazi/plugins/update.sh diff --git a/pkgs/by-name/ya/yazi/plugins/default.nix b/pkgs/by-name/ya/yazi/plugins/default.nix index 6fbde69e2b1b..8094f3159d4d 100644 --- a/pkgs/by-name/ya/yazi/plugins/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/default.nix @@ -2,9 +2,11 @@ lib, callPackage, stdenvNoCC, + writeShellScript, }: let root = ./.; + updateScript = ./update.sh; mkYaziPlugin = args@{ @@ -14,6 +16,10 @@ let installPhase ? null, ... }: + let + # Extract the plugin name from pname (removing .yazi suffix if present) + pluginName = lib.removeSuffix ".yazi" pname; + in stdenvNoCC.mkDerivation ( args // { @@ -45,6 +51,16 @@ let description = meta.description or ""; platforms = meta.platforms or lib.platforms.all; }; + passthru = (args.passthru or { }) // { + updateScript = { + command = writeShellScript "update-${pluginName}" '' + export PLUGIN_NAME="${pluginName}" + export PLUGIN_PNAME="${pname}" + exec ${updateScript} + ''; + supportedFeatures = [ "commit" ]; + }; + }; } ); diff --git a/pkgs/by-name/ya/yazi/plugins/update.sh b/pkgs/by-name/ya/yazi/plugins/update.sh new file mode 100755 index 000000000000..7149fe8698bd --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/update.sh @@ -0,0 +1,141 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash curl coreutils jq git + +set -e + +# Basic setup and validation +NIXPKGS_DIR="$PWD" + +if [ "${PLUGIN_NAME:-}" = "" ] || [ "${PLUGIN_PNAME:-}" = "" ]; then + echo "Error: PLUGIN_NAME and PLUGIN_PNAME environment variables must be set" + exit 1 +fi + +PLUGIN_DIR="$NIXPKGS_DIR/pkgs/by-name/ya/yazi/plugins/$PLUGIN_NAME" +if [ ! -f "$PLUGIN_DIR/default.nix" ]; then + echo "Error: Could not find default.nix for plugin $PLUGIN_NAME at $PLUGIN_DIR" + exit 1 +fi + +GITHUB_HEADER=(-H "Accept: application/vnd.github.v3+json") +if [ "${GITHUB_TOKEN:-}" != "" ]; then + GITHUB_HEADER+=(-H "Authorization: token $GITHUB_TOKEN") +fi + +# Get repository info and Yazi version +OWNER=$(nix eval --raw -f "$NIXPKGS_DIR" yaziPlugins."$PLUGIN_NAME".src.owner) +REPO=$(nix eval --raw -f "$NIXPKGS_DIR" yaziPlugins."$PLUGIN_NAME".src.repo) +YAZI_VERSION=$(nix eval --raw -f "$NIXPKGS_DIR" yazi-unwrapped.version) + +# Check plugin compatibility with current Yazi version +PLUGIN_PATH="$([[ $OWNER == "yazi-rs" ]] && echo "$PLUGIN_PNAME/" || echo "")" +MAIN_LUA_URL="https://raw.githubusercontent.com/$OWNER/$REPO/main/${PLUGIN_PATH}main.lua" +PLUGIN_CONTENT=$(curl --silent "${GITHUB_HEADER[@]}" "$MAIN_LUA_URL") +REQUIRED_VERSION=$(echo "$PLUGIN_CONTENT" | head -n 1 | grep -o "since [0-9.]*" | sed 's/since \([0-9.]*\)/\1/') + +# If no version requirement is found, default to "0" +if [ "$REQUIRED_VERSION" = "" ]; then + echo "No version requirement found for $PLUGIN_NAME, assuming compatible with any Yazi version" + REQUIRED_VERSION="0" +else + # Check if the plugin is compatible with current Yazi version + if ! printf "%s\n%s\n" "$REQUIRED_VERSION" "$YAZI_VERSION" | sort -C -V; then + echo "$PLUGIN_NAME plugin requires Yazi $REQUIRED_VERSION, but we have $YAZI_VERSION" + exit 0 + fi +fi + +# Get latest commit info +if [ "$OWNER" == "yazi-rs" ]; then + # For official plugins, get commit info for the specific plugin file + API_URL="https://api.github.com/repos/$OWNER/$REPO/commits?path=$PLUGIN_PNAME/main.lua&per_page=1" +else + # For third-party plugins, get latest commit on main branch + API_URL="https://api.github.com/repos/$OWNER/$REPO/commits/main" +fi + +if [ "$OWNER" == "yazi-rs" ]; then + COMMIT_DATA=$(curl --silent "${GITHUB_HEADER[@]}" "$API_URL") + LATEST_COMMIT=$(echo "$COMMIT_DATA" | jq -r '.[0].sha') + COMMIT_DATE=$(echo "$COMMIT_DATA" | jq -r '.[0].commit.committer.date' | cut -d'T' -f1) +else + COMMIT_DATA=$(curl --silent "${GITHUB_HEADER[@]}" "$API_URL") + LATEST_COMMIT=$(echo "$COMMIT_DATA" | jq -r '.sha') + COMMIT_DATE=$(echo "$COMMIT_DATA" | jq -r '.commit.committer.date' | cut -d'T' -f1) +fi + +if [ "$LATEST_COMMIT" = "" ] || [ "$LATEST_COMMIT" == "null" ]; then + echo "Error: Could not get latest commit hash for $PLUGIN_NAME" + exit 1 +fi + +echo "Updating $PLUGIN_NAME to commit $LATEST_COMMIT ($COMMIT_DATE)" + +# Update version and revision +NEW_VERSION="${REQUIRED_VERSION}-unstable-${COMMIT_DATE}" + +# Update the revision in default.nix +sed -i "s/rev = \"[^\"]*\"/rev = \"$LATEST_COMMIT\"/" "$PLUGIN_DIR/default.nix" + +# Update the version in default.nix +if grep -q 'version = "' "$PLUGIN_DIR/default.nix"; then + sed -i "s/version = \"[^\"]*\"/version = \"$NEW_VERSION\"/" "$PLUGIN_DIR/default.nix" +else + # Add version attribute after pname if it doesn't exist + sed -i "/pname = \"[^\"]*\"/a \ \ version = \"$NEW_VERSION\";" "$PLUGIN_DIR/default.nix" +fi + +# Update the hash +# Calculate hash directly for all plugins +PREFETCH_URL="https://github.com/$OWNER/$REPO/archive/$LATEST_COMMIT.tar.gz" + +# Get the hash directly in SRI format +NEW_HASH=$(nix-prefetch-url --unpack --type sha256 "$PREFETCH_URL" 2>/dev/null) + +# If the hash is not in SRI format, convert it +if [[ ! "$NEW_HASH" =~ ^sha256- ]]; then + # Try to convert the hash to SRI format + NEW_HASH=$(nix hash to-sri --type sha256 "$NEW_HASH" 2>/dev/null) + + # If that fails, try another approach + if [[ ! "$NEW_HASH" =~ ^sha256- ]]; then + echo "Warning: Failed to get SRI hash directly, trying alternative method..." + RAW_HASH=$(nix-prefetch-url --type sha256 "$PREFETCH_URL" 2>/dev/null) + NEW_HASH=$(nix hash to-sri --type sha256 "$RAW_HASH" 2>/dev/null) + fi +fi + +# Verify we got a valid SRI hash (starts with sha256-) +if [[ ! "$NEW_HASH" =~ ^sha256- ]]; then + echo "Error: Failed to generate valid SRI hash. Output was:" + echo "$NEW_HASH" + exit 1 +fi + +echo "Generated SRI hash: $NEW_HASH" + +# Update hash in default.nix +if grep -q 'hash = "' "$PLUGIN_DIR/default.nix"; then + sed -i "s|hash = \"[^\"]*\"|hash = \"$NEW_HASH\"|" "$PLUGIN_DIR/default.nix" +else + # For files that use fetchFromGitHub, update the hash there + if grep -q 'fetchFromGitHub' "$PLUGIN_DIR/default.nix"; then + sed -i "s|sha256 = \"[^\"]*\"|sha256 = \"$NEW_HASH\"|" "$PLUGIN_DIR/default.nix" + else + echo "Error: Could not find hash attribute in $PLUGIN_DIR/default.nix" + exit 1 + fi +fi + +# Verify the hash was updated +if grep -q "hash = \"$NEW_HASH\"" "$PLUGIN_DIR/default.nix" || grep -q "sha256 = \"$NEW_HASH\"" "$PLUGIN_DIR/default.nix"; then + echo "Successfully updated hash to: $NEW_HASH" +else + echo "Error: Failed to update hash in $PLUGIN_DIR/default.nix" + exit 1 +fi + +# Update the revision in default.nix +sed -i "s/rev = \"[^\"]*\"/rev = \"$LATEST_COMMIT\"/" "$PLUGIN_DIR/default.nix" + +echo "Successfully updated $PLUGIN_NAME to version $NEW_VERSION (commit $LATEST_COMMIT)" From 72279b768779d1947b172d4b177af8bfe512305c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 10 Apr 2025 11:23:21 +1000 Subject: [PATCH 128/240] home-assistant-custom-lovelace-modules.advanced-camera-card: 7.5.1 -> 7.6.1 (#397546) https://github.com/dermotduffy/advanced-camera-card/releases/tag/v7.6.0 https://github.com/dermotduffy/advanced-camera-card/releases/tag/v7.6.1 --- .../custom-lovelace-modules/advanced-camera-card/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix index 0a2de14dc893..548f33b53df2 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "advanced-camera-card"; - version = "7.5.1"; + version = "7.6.1"; src = fetchzip { url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip"; - hash = "sha256-H1DI9Tn9f2UJy6oJ1O4yYfi0Zof53thIOmho6Wy9fFA="; + hash = "sha256-CfS3KdoFiGBWrhJZw5BCCAolXn1n6nuO3OAJL5U2UBY="; }; # TODO: build from source once yarn berry support lands in nixpkgs From 581cdfc6de284e42abe9ba67164cbb2d97b4c09c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 9 Apr 2025 20:20:07 -0500 Subject: [PATCH 129/240] yaziPlugins: rewrite update script in python --- pkgs/by-name/ya/yazi/plugins/default.nix | 2 +- pkgs/by-name/ya/yazi/plugins/update.py | 256 +++++++++++++++++++++++ pkgs/by-name/ya/yazi/plugins/update.sh | 141 ------------- 3 files changed, 257 insertions(+), 142 deletions(-) create mode 100755 pkgs/by-name/ya/yazi/plugins/update.py delete mode 100755 pkgs/by-name/ya/yazi/plugins/update.sh diff --git a/pkgs/by-name/ya/yazi/plugins/default.nix b/pkgs/by-name/ya/yazi/plugins/default.nix index 8094f3159d4d..170dedda57b6 100644 --- a/pkgs/by-name/ya/yazi/plugins/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/default.nix @@ -6,7 +6,7 @@ }: let root = ./.; - updateScript = ./update.sh; + updateScript = ./update.py; mkYaziPlugin = args@{ diff --git a/pkgs/by-name/ya/yazi/plugins/update.py b/pkgs/by-name/ya/yazi/plugins/update.py new file mode 100755 index 000000000000..510d2e867a0a --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/update.py @@ -0,0 +1,256 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p python3 python3Packages.requests python3Packages.packaging nix curl git + +import os +import re +import subprocess +import sys +from pathlib import Path +from typing import Dict, Tuple + +import requests +from packaging import version + + +def run_command(cmd: str, capture_output: bool = True) -> str: + """Run a shell command and return its output""" + result = subprocess.run(cmd, shell=True, text=True, capture_output=capture_output) + if result.returncode != 0: + if capture_output: + print(f"Error running command: {cmd}") + print(f"stderr: {result.stderr}") + sys.exit(1) + return result.stdout.strip() if capture_output else "" + + +def get_plugin_info(nixpkgs_dir: str, plugin_name: str) -> Dict[str, str]: + """Get plugin repository information from Nix""" + owner = run_command(f"nix eval --raw -f {nixpkgs_dir} yaziPlugins.\"{plugin_name}\".src.owner") + repo = run_command(f"nix eval --raw -f {nixpkgs_dir} yaziPlugins.\"{plugin_name}\".src.repo") + + return { + "owner": owner, + "repo": repo + } + + +def get_yazi_version(nixpkgs_dir: str) -> str: + """Get the current Yazi version from Nix""" + return run_command(f"nix eval --raw -f {nixpkgs_dir} yazi-unwrapped.version") + + + +def get_github_headers() -> Dict[str, str]: + """Create headers for GitHub API requests""" + headers = {"Accept": "application/vnd.github.v3+json"} + github_token = os.environ.get("GITHUB_TOKEN") + if github_token: + headers["Authorization"] = f"token {github_token}" + return headers + + +def fetch_plugin_content(owner: str, repo: str, plugin_pname: str, headers: Dict[str, str]) -> str: + """Fetch the plugin's main.lua content from GitHub""" + plugin_path = f"{plugin_pname}/" if owner == "yazi-rs" else "" + main_lua_url = f"https://raw.githubusercontent.com/{owner}/{repo}/main/{plugin_path}main.lua" + + try: + response = requests.get(main_lua_url, headers=headers) + response.raise_for_status() + return response.text + except requests.RequestException as e: + print(f"Error fetching plugin content: {e}") + sys.exit(1) + + +def check_version_compatibility(plugin_content: str, plugin_name: str, yazi_version: str) -> str: + """Check if the plugin is compatible with the current Yazi version""" + required_version_match = re.search(r"since ([0-9.]+)", plugin_content.split("\n")[0]) + required_version = required_version_match.group(1) if required_version_match else "0" + + if required_version == "0": + print(f"No version requirement found for {plugin_name}, assuming compatible with any Yazi version") + else: + # Check if the plugin is compatible with current Yazi version + if version.parse(required_version) > version.parse(yazi_version): + print(f"{plugin_name} plugin requires Yazi {required_version}, but we have {yazi_version}") + sys.exit(0) + + return required_version + + +def get_latest_commit(owner: str, repo: str, plugin_pname: str, headers: Dict[str, str]) -> Tuple[str, str]: + """Get the latest commit hash and date for the plugin""" + if owner == "yazi-rs": + # For official plugins, get commit info for the specific plugin file + api_url = f"https://api.github.com/repos/{owner}/{repo}/commits?path={plugin_pname}/main.lua&per_page=1" + else: + # For third-party plugins, get latest commit on main branch + api_url = f"https://api.github.com/repos/{owner}/{repo}/commits/main" + + try: + response = requests.get(api_url, headers=headers) + response.raise_for_status() + commit_data = response.json() + except requests.RequestException as e: + print(f"Error fetching commit data: {e}") + sys.exit(1) + + if owner == "yazi-rs": + latest_commit = commit_data[0]["sha"] + commit_date = commit_data[0]["commit"]["committer"]["date"].split("T")[0] + else: + latest_commit = commit_data["sha"] + commit_date = commit_data["commit"]["committer"]["date"].split("T")[0] + + if not latest_commit: + print("Error: Could not get latest commit hash") + sys.exit(1) + + return latest_commit, commit_date + + +def calculate_sri_hash(owner: str, repo: str, latest_commit: str) -> str: + """Calculate the SRI hash for the plugin source""" + prefetch_url = f"https://github.com/{owner}/{repo}/archive/{latest_commit}.tar.gz" + + try: + new_hash = run_command(f"nix-prefetch-url --unpack --type sha256 {prefetch_url} 2>/dev/null") + + # If the hash is not in SRI format, convert it + if not new_hash.startswith("sha256-"): + # Try to convert the hash to SRI format + new_hash = run_command(f"nix hash to-sri --type sha256 {new_hash} 2>/dev/null") + + # If that fails, try another approach + if not new_hash.startswith("sha256-"): + print("Warning: Failed to get SRI hash directly, trying alternative method...") + raw_hash = run_command(f"nix-prefetch-url --type sha256 {prefetch_url} 2>/dev/null") + new_hash = run_command(f"nix hash to-sri --type sha256 {raw_hash} 2>/dev/null") + except Exception as e: + print(f"Error calculating hash: {e}") + sys.exit(1) + + # Verify we got a valid SRI hash + if not new_hash.startswith("sha256-"): + print(f"Error: Failed to generate valid SRI hash. Output was: {new_hash}") + sys.exit(1) + + return new_hash + + +def read_nix_file(file_path: str) -> str: + """Read the content of a Nix file""" + try: + with open(file_path, 'r') as f: + return f.read() + except IOError as e: + print(f"Error reading file {file_path}: {e}") + sys.exit(1) + + +def write_nix_file(file_path: str, content: str) -> None: + """Write content to a Nix file""" + try: + with open(file_path, 'w') as f: + f.write(content) + except IOError as e: + print(f"Error writing to file {file_path}: {e}") + sys.exit(1) + + +def update_nix_file(default_nix_path: str, latest_commit: str, new_version: str, new_hash: str) -> None: + """Update the default.nix file with new version, revision and hash""" + default_nix_content = read_nix_file(default_nix_path) + + # Update the revision in default.nix + default_nix_content = re.sub(r'rev = "[^"]*"', f'rev = "{latest_commit}"', default_nix_content) + + # Update the version in default.nix + if 'version = "' in default_nix_content: + default_nix_content = re.sub(r'version = "[^"]*"', f'version = "{new_version}"', default_nix_content) + else: + # Add version attribute after pname if it doesn't exist + default_nix_content = re.sub(r'(pname = "[^"]*";)', f'\\1\n version = "{new_version}";', default_nix_content) + + # Update hash in default.nix + if 'hash = "' in default_nix_content: + default_nix_content = re.sub(r'hash = "[^"]*"', f'hash = "{new_hash}"', default_nix_content) + elif 'fetchFromGitHub' in default_nix_content: + default_nix_content = re.sub(r'sha256 = "[^"]*"', f'sha256 = "{new_hash}"', default_nix_content) + else: + print(f"Error: Could not find hash attribute in {default_nix_path}") + sys.exit(1) + + # Write the updated content back to the file + write_nix_file(default_nix_path, default_nix_content) + + # Verify the hash was updated + updated_content = read_nix_file(default_nix_path) + if f'hash = "{new_hash}"' in updated_content or f'sha256 = "{new_hash}"' in updated_content: + print(f"Successfully updated hash to: {new_hash}") + else: + print(f"Error: Failed to update hash in {default_nix_path}") + sys.exit(1) + + +def validate_environment() -> Tuple[str, str, str]: + """Validate environment variables and paths""" + nixpkgs_dir = os.getcwd() + + plugin_name = os.environ.get("PLUGIN_NAME") + plugin_pname = os.environ.get("PLUGIN_PNAME") + + if not plugin_name or not plugin_pname: + print("Error: PLUGIN_NAME and PLUGIN_PNAME environment variables must be set") + sys.exit(1) + + plugin_dir = f"{nixpkgs_dir}/pkgs/by-name/ya/yazi/plugins/{plugin_name}" + if not Path(f"{plugin_dir}/default.nix").exists(): + print(f"Error: Could not find default.nix for plugin {plugin_name} at {plugin_dir}") + sys.exit(1) + + return nixpkgs_dir, plugin_name, plugin_pname + + +def main(): + """Main function to update a Yazi plugin""" + # Basic setup and validation + nixpkgs_dir, plugin_name, plugin_pname = validate_environment() + plugin_dir = f"{nixpkgs_dir}/pkgs/by-name/ya/yazi/plugins/{plugin_name}" + default_nix_path = f"{plugin_dir}/default.nix" + + # Get repository info + plugin_info = get_plugin_info(nixpkgs_dir, plugin_name) + owner = plugin_info["owner"] + repo = plugin_info["repo"] + + # Get Yazi version separately + yazi_version = get_yazi_version(nixpkgs_dir) + + # Setup GitHub API headers + headers = get_github_headers() + + # Check plugin compatibility with current Yazi version + plugin_content = fetch_plugin_content(owner, repo, plugin_pname, headers) + required_version = check_version_compatibility(plugin_content, plugin_name, yazi_version) + + # Get latest commit info + latest_commit, commit_date = get_latest_commit(owner, repo, plugin_pname, headers) + print(f"Updating {plugin_name} to commit {latest_commit} ({commit_date})") + + # Generate new version string + new_version = f"{required_version}-unstable-{commit_date}" + + # Calculate hash for the plugin + new_hash = calculate_sri_hash(owner, repo, latest_commit) + print(f"Generated SRI hash: {new_hash}") + + # Update the default.nix file + update_nix_file(default_nix_path, latest_commit, new_version, new_hash) + + print(f"Successfully updated {plugin_name} to version {new_version} (commit {latest_commit})") + + +if __name__ == "__main__": + main() diff --git a/pkgs/by-name/ya/yazi/plugins/update.sh b/pkgs/by-name/ya/yazi/plugins/update.sh deleted file mode 100755 index 7149fe8698bd..000000000000 --- a/pkgs/by-name/ya/yazi/plugins/update.sh +++ /dev/null @@ -1,141 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash curl coreutils jq git - -set -e - -# Basic setup and validation -NIXPKGS_DIR="$PWD" - -if [ "${PLUGIN_NAME:-}" = "" ] || [ "${PLUGIN_PNAME:-}" = "" ]; then - echo "Error: PLUGIN_NAME and PLUGIN_PNAME environment variables must be set" - exit 1 -fi - -PLUGIN_DIR="$NIXPKGS_DIR/pkgs/by-name/ya/yazi/plugins/$PLUGIN_NAME" -if [ ! -f "$PLUGIN_DIR/default.nix" ]; then - echo "Error: Could not find default.nix for plugin $PLUGIN_NAME at $PLUGIN_DIR" - exit 1 -fi - -GITHUB_HEADER=(-H "Accept: application/vnd.github.v3+json") -if [ "${GITHUB_TOKEN:-}" != "" ]; then - GITHUB_HEADER+=(-H "Authorization: token $GITHUB_TOKEN") -fi - -# Get repository info and Yazi version -OWNER=$(nix eval --raw -f "$NIXPKGS_DIR" yaziPlugins."$PLUGIN_NAME".src.owner) -REPO=$(nix eval --raw -f "$NIXPKGS_DIR" yaziPlugins."$PLUGIN_NAME".src.repo) -YAZI_VERSION=$(nix eval --raw -f "$NIXPKGS_DIR" yazi-unwrapped.version) - -# Check plugin compatibility with current Yazi version -PLUGIN_PATH="$([[ $OWNER == "yazi-rs" ]] && echo "$PLUGIN_PNAME/" || echo "")" -MAIN_LUA_URL="https://raw.githubusercontent.com/$OWNER/$REPO/main/${PLUGIN_PATH}main.lua" -PLUGIN_CONTENT=$(curl --silent "${GITHUB_HEADER[@]}" "$MAIN_LUA_URL") -REQUIRED_VERSION=$(echo "$PLUGIN_CONTENT" | head -n 1 | grep -o "since [0-9.]*" | sed 's/since \([0-9.]*\)/\1/') - -# If no version requirement is found, default to "0" -if [ "$REQUIRED_VERSION" = "" ]; then - echo "No version requirement found for $PLUGIN_NAME, assuming compatible with any Yazi version" - REQUIRED_VERSION="0" -else - # Check if the plugin is compatible with current Yazi version - if ! printf "%s\n%s\n" "$REQUIRED_VERSION" "$YAZI_VERSION" | sort -C -V; then - echo "$PLUGIN_NAME plugin requires Yazi $REQUIRED_VERSION, but we have $YAZI_VERSION" - exit 0 - fi -fi - -# Get latest commit info -if [ "$OWNER" == "yazi-rs" ]; then - # For official plugins, get commit info for the specific plugin file - API_URL="https://api.github.com/repos/$OWNER/$REPO/commits?path=$PLUGIN_PNAME/main.lua&per_page=1" -else - # For third-party plugins, get latest commit on main branch - API_URL="https://api.github.com/repos/$OWNER/$REPO/commits/main" -fi - -if [ "$OWNER" == "yazi-rs" ]; then - COMMIT_DATA=$(curl --silent "${GITHUB_HEADER[@]}" "$API_URL") - LATEST_COMMIT=$(echo "$COMMIT_DATA" | jq -r '.[0].sha') - COMMIT_DATE=$(echo "$COMMIT_DATA" | jq -r '.[0].commit.committer.date' | cut -d'T' -f1) -else - COMMIT_DATA=$(curl --silent "${GITHUB_HEADER[@]}" "$API_URL") - LATEST_COMMIT=$(echo "$COMMIT_DATA" | jq -r '.sha') - COMMIT_DATE=$(echo "$COMMIT_DATA" | jq -r '.commit.committer.date' | cut -d'T' -f1) -fi - -if [ "$LATEST_COMMIT" = "" ] || [ "$LATEST_COMMIT" == "null" ]; then - echo "Error: Could not get latest commit hash for $PLUGIN_NAME" - exit 1 -fi - -echo "Updating $PLUGIN_NAME to commit $LATEST_COMMIT ($COMMIT_DATE)" - -# Update version and revision -NEW_VERSION="${REQUIRED_VERSION}-unstable-${COMMIT_DATE}" - -# Update the revision in default.nix -sed -i "s/rev = \"[^\"]*\"/rev = \"$LATEST_COMMIT\"/" "$PLUGIN_DIR/default.nix" - -# Update the version in default.nix -if grep -q 'version = "' "$PLUGIN_DIR/default.nix"; then - sed -i "s/version = \"[^\"]*\"/version = \"$NEW_VERSION\"/" "$PLUGIN_DIR/default.nix" -else - # Add version attribute after pname if it doesn't exist - sed -i "/pname = \"[^\"]*\"/a \ \ version = \"$NEW_VERSION\";" "$PLUGIN_DIR/default.nix" -fi - -# Update the hash -# Calculate hash directly for all plugins -PREFETCH_URL="https://github.com/$OWNER/$REPO/archive/$LATEST_COMMIT.tar.gz" - -# Get the hash directly in SRI format -NEW_HASH=$(nix-prefetch-url --unpack --type sha256 "$PREFETCH_URL" 2>/dev/null) - -# If the hash is not in SRI format, convert it -if [[ ! "$NEW_HASH" =~ ^sha256- ]]; then - # Try to convert the hash to SRI format - NEW_HASH=$(nix hash to-sri --type sha256 "$NEW_HASH" 2>/dev/null) - - # If that fails, try another approach - if [[ ! "$NEW_HASH" =~ ^sha256- ]]; then - echo "Warning: Failed to get SRI hash directly, trying alternative method..." - RAW_HASH=$(nix-prefetch-url --type sha256 "$PREFETCH_URL" 2>/dev/null) - NEW_HASH=$(nix hash to-sri --type sha256 "$RAW_HASH" 2>/dev/null) - fi -fi - -# Verify we got a valid SRI hash (starts with sha256-) -if [[ ! "$NEW_HASH" =~ ^sha256- ]]; then - echo "Error: Failed to generate valid SRI hash. Output was:" - echo "$NEW_HASH" - exit 1 -fi - -echo "Generated SRI hash: $NEW_HASH" - -# Update hash in default.nix -if grep -q 'hash = "' "$PLUGIN_DIR/default.nix"; then - sed -i "s|hash = \"[^\"]*\"|hash = \"$NEW_HASH\"|" "$PLUGIN_DIR/default.nix" -else - # For files that use fetchFromGitHub, update the hash there - if grep -q 'fetchFromGitHub' "$PLUGIN_DIR/default.nix"; then - sed -i "s|sha256 = \"[^\"]*\"|sha256 = \"$NEW_HASH\"|" "$PLUGIN_DIR/default.nix" - else - echo "Error: Could not find hash attribute in $PLUGIN_DIR/default.nix" - exit 1 - fi -fi - -# Verify the hash was updated -if grep -q "hash = \"$NEW_HASH\"" "$PLUGIN_DIR/default.nix" || grep -q "sha256 = \"$NEW_HASH\"" "$PLUGIN_DIR/default.nix"; then - echo "Successfully updated hash to: $NEW_HASH" -else - echo "Error: Failed to update hash in $PLUGIN_DIR/default.nix" - exit 1 -fi - -# Update the revision in default.nix -sed -i "s/rev = \"[^\"]*\"/rev = \"$LATEST_COMMIT\"/" "$PLUGIN_DIR/default.nix" - -echo "Successfully updated $PLUGIN_NAME to version $NEW_VERSION (commit $LATEST_COMMIT)" From 7de1e8e93c5cbb8a297f85f5bebbd93a078e7b14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 01:52:48 +0000 Subject: [PATCH 130/240] kraft: 0.11.5 -> 0.11.6 --- pkgs/by-name/kr/kraft/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/kr/kraft/package.nix b/pkgs/by-name/kr/kraft/package.nix index 04718b428d44..d8f2466afa0e 100644 --- a/pkgs/by-name/kr/kraft/package.nix +++ b/pkgs/by-name/kr/kraft/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "kraftkit"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "unikraft"; repo = "kraftkit"; rev = "v${version}"; - hash = "sha256-rwowlwP56IAdogEL6/SBGDtvOW7FhO4+2vTWI755HXI="; + hash = "sha256-a6c7g2cxrawE7BRpcrsefCQ7xQ56wVOGjFexdkOKnv0="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ buildGoModule rec { btrfs-progs ]; - vendorHash = "sha256-LdLbAja4AoND5kA+A4rEl5r4tUVDTVxiYzV5GUJP+CA="; + vendorHash = "sha256-lwgxedKLcuV6RucbU26sDO+9j+8uWkignJDomFHaSXU="; ldflags = [ "-s" From 43c291d22e19acda1e2a2619356af7f517abde64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 01:56:48 +0000 Subject: [PATCH 131/240] updatecli: 0.96.0 -> 0.97.0 --- pkgs/by-name/up/updatecli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index 66ef766b6532..6fc2ca44b045 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "updatecli"; - version = "0.96.0"; + version = "0.97.0"; src = fetchFromGitHub { owner = "updatecli"; repo = "updatecli"; rev = "v${version}"; - hash = "sha256-znl0yUqnN9eQHY18wPfcYiUnsGw349tLSkZNa/Wz2KA="; + hash = "sha256-3I7SRtbMKPm/j8bdIvVHkRy/5Jq8goZ0hyREsfsM5OU="; }; - vendorHash = "sha256-jUVoNTA1wVHNjxkLBgERo8650dxpzmuVBGiAw5sUql0="; + vendorHash = "sha256-LUc73GyBj72kwQXUEnwkkGPmkIXhAhiKJiLcc1IiAps="; # tests require network access doCheck = false; From 0285feb74965656cbc37ccae670ae249dfd3ef48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 02:17:06 +0000 Subject: [PATCH 132/240] vscode-extensions.reditorsupport.r: 2.8.4 -> 2.8.5 --- .../editors/vscode/extensions/reditorsupport.r/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix index 5fc6dfa5071b..86b8bd729f71 100644 --- a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix +++ b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "r"; publisher = "reditorsupport"; - version = "2.8.4"; - hash = "sha256-wVT9/JUuqP8whW99q1gwVMf7PRzgZNLoIdlXsclpbck="; + version = "2.8.5"; + hash = "sha256-cZeZdrViEae9sRb9GyB/LeSQ5NRb/fAp3qQW9mPMbsM="; }; nativeBuildInputs = [ jq From 7144039100a6b5a6ddeea41717f51d82c6ab60e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 02:18:13 +0000 Subject: [PATCH 133/240] siyuan: 3.1.26 -> 3.1.27 --- pkgs/by-name/si/siyuan/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 1575f64c73e1..14d153817a62 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -35,20 +35,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.1.26"; + version = "3.1.27"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-Hkvlodf2zBT/+ohmxLrinbBiluCmSsGRKnw4ZrdFcAg="; + hash = "sha256-QRj1MHGpSWD+X84CxAYCaVeXjreQHV4BI8KevQvdcqY="; }; kernel = buildGo123Module { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-NJPb5nJWDTiQ5H/RPDA0IHMaWvzlNNXUA2WkpG2lk8I="; + vendorHash = "sha256-oy2t5IBn9JJY5cm16Yak6e9dDl0KAEVtCE6SJ205vok="; patches = [ (replaceVars ./set-pandoc-path.patch { From 9f4704c4dc5ad2fa4bc0371f15b48b81d18bd48e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 02:22:16 +0000 Subject: [PATCH 134/240] melonDS: 1.0rc-unstable-2025-03-09 -> 1.0rc-unstable-2025-04-09 --- pkgs/by-name/me/melonDS/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 8c8159dec617..dbd15dacc960 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "1.0rc-unstable-2025-03-09"; + version = "1.0rc-unstable-2025-04-09"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "0fcf1f6e3a443cb249f85d948ff6e58dc58501d6"; - hash = "sha256-llRmW596UHs/q/DjqG8qQ1RqjvmGMsOO1IUkpjPW4h4="; + rev = "9ed7e5803e55c5eeb29ec560c8659b38ed331749"; + hash = "sha256-wLCaGnaMYaPjFzYTph16WTdE89j4MFaO4FuIQdH9R80="; }; nativeBuildInputs = [ From 42f06c838aed977d58cfab38cb58b9c52519aa97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 02:26:36 +0000 Subject: [PATCH 135/240] nushellPlugins.units: 0.1.4 -> 0.1.5 --- pkgs/shells/nushell/plugins/units.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/shells/nushell/plugins/units.nix index 4be46ad05f7e..f6aa34a02730 100644 --- a/pkgs/shells/nushell/plugins/units.nix +++ b/pkgs/shells/nushell/plugins/units.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_units"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { repo = "nu_plugin_units"; owner = "JosephTLyons"; rev = "v${version}"; - hash = "sha256-iDRrA8bvufV92ADeG+eF3xu7I/4IinJcSxEkwuhkHlg="; + hash = "sha256-Uw8OcfSETRceaoEnJP1B++v0SqGjzaYz1wCMVMe774s="; }; useFetchCargoVendor = true; - cargoHash = "sha256-8TYqvg+g9VmzbNwOGLfE274r1dvlKiMovJCciVgc+yw="; + cargoHash = "sha256-3v9jP8nL0JqtC76igsCytkQAVTgWqzHH0KQX3o6bi0c="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ From 4a22c933e517437bba9992700d13869c8214ddb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 02:40:27 +0000 Subject: [PATCH 136/240] double-entry-generator: 2.7.1 -> 2.8.0 --- pkgs/by-name/do/double-entry-generator/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/double-entry-generator/package.nix b/pkgs/by-name/do/double-entry-generator/package.nix index f57f8b185b9d..ca1d3f03ca11 100644 --- a/pkgs/by-name/do/double-entry-generator/package.nix +++ b/pkgs/by-name/do/double-entry-generator/package.nix @@ -6,15 +6,15 @@ }: buildGoModule rec { pname = "double-entry-generator"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "deb-sig"; repo = "double-entry-generator"; - hash = "sha256-2Y8Spj1LAVZsUgChDYDCZ63pTH+nqs2ff9xcmC+gr0c="; + hash = "sha256-DsNcQacbdBzOMK9mVuuK8yz9RXqykYLhXE5YSFYmipA="; rev = "v${version}"; }; - vendorHash = "sha256-Xedva9oGteOnv3rP4Wo3sOHIPyuy2TYwkZV2BAuxY4M="; + vendorHash = "sha256-/QMt8zPvHM9znUc0+iUC82bOUJoBmH+shJ9D7AHiQ1E="; excludedPackages = [ "hack" ]; From 073aaf0a320ba92b5ee1721fdb4dc29424a8cc5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 02:50:45 +0000 Subject: [PATCH 137/240] python312Packages.pydmd: 2025.03.01 -> 2025.04.01 --- pkgs/development/python-modules/pydmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index 9da1917c0a3f..1e390e8cf6c9 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "pydmd"; - version = "2025.03.01"; + version = "2025.04.01"; pyproject = true; src = fetchFromGitHub { owner = "PyDMD"; repo = "PyDMD"; tag = version; - hash = "sha256-2pfWW+CLSDr6tJrcLpodil/RnhLTZ5Yqw0ThTCqO0MY="; + hash = "sha256-+ol103I4lrTVvANAK5k6bFfeUWj04YlkAqJUW8cw42Q="; }; postPatch = '' From 44ccb82dcb980b55818e5ce234d6d571b354f965 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 03:20:35 +0000 Subject: [PATCH 138/240] aws-nuke: 3.51.0 -> 3.51.1 --- pkgs/by-name/aw/aws-nuke/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/aw/aws-nuke/package.nix b/pkgs/by-name/aw/aws-nuke/package.nix index edf5b8a57eba..a5f362c1b094 100644 --- a/pkgs/by-name/aw/aws-nuke/package.nix +++ b/pkgs/by-name/aw/aws-nuke/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "aws-nuke"; - version = "3.51.0"; + version = "3.51.1"; src = fetchFromGitHub { owner = "ekristen"; repo = "aws-nuke"; tag = "v${version}"; - hash = "sha256-ITYHcmOK+vPezxdMNsFwdxUXDHXljVUOyrdR7eXJYeE="; + hash = "sha256-sInF2z9m5BQALE7a1/72HhLfvfdY2mIcMSurhz/jmpg="; }; vendorHash = "sha256-DK7nR5P/Y/aSpG+AORYHmVypeVNfRqWE7X8J40lVyjY="; From cdbad91e4724b150d8338015a8a6cd87c40081e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 03:31:00 +0000 Subject: [PATCH 139/240] pmtiles: 1.27.0 -> 1.27.1 --- pkgs/by-name/pm/pmtiles/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix index 9d8a2524d740..f04a8d97598f 100644 --- a/pkgs/by-name/pm/pmtiles/package.nix +++ b/pkgs/by-name/pm/pmtiles/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "pmtiles"; - version = "1.27.0"; + version = "1.27.1"; src = fetchFromGitHub { owner = "protomaps"; repo = "go-pmtiles"; tag = "v${version}"; - hash = "sha256-AeHdmspvx8/vThhbKDROGS7vKBxx9fpe1PFSrVUV1uI="; + hash = "sha256-SQzCNgRDu5elkCH0fTDL3w23Z6G2P1IuxSWwZYxQwVo="; }; vendorHash = "sha256-kfEzpaFMf0W8Ygtl40LBy3AZQSL+9Uo+n2x9OTOavqk="; From 820a567536299e2a7691fb2f5eeeca65e7365346 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 03:53:39 +0000 Subject: [PATCH 140/240] python312Packages.pyvo: 1.6.1 -> 1.6.2 --- pkgs/development/python-modules/pyvo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index 7c61844c195b..a8f498e1043f 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyvo"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - hash = "sha256-+JZxfKmCWtBtNFWNjxPEROJJuMLSpHVQekY17M3SzUE="; + hash = "sha256-6p6A8qMMOb5VZL9GVF99sK98bvX9HaKDbrQ1pQB/eAI="; }; build-system = [ From 68e8ca867723df74a8a99488975fa03508badc13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 04:00:38 +0000 Subject: [PATCH 141/240] nufmt: 0-unstable-2024-11-21 -> 0-unstable-2025-04-09 --- pkgs/by-name/nu/nufmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index 5c5ccfecb46d..33cafd689865 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage { pname = "nufmt"; - version = "0-unstable-2024-11-21"; + version = "0-unstable-2025-04-09"; src = fetchFromGitHub { owner = "nushell"; repo = "nufmt"; - rev = "628a3b73ea637c96f2c191ae066cf1cecadeafa3"; - hash = "sha256-ideILLOawU6BNawmr4lqt2LGkf29wvlwQe9gqgdYRiI="; + rev = "8a29b3a1e3b8009c0c2430d5158ac3ddb7f9e023"; + hash = "sha256-aUaM/haZZOagG8/e4eUFsZJ1bhwAaS7fwNoCFUFYEAg="; }; nativeBuildInputs = [ From f024d54d49646d624d1d91ba27c3302e085806dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 04:29:24 +0000 Subject: [PATCH 142/240] plasma-panel-colorizer: 2.4.1 -> 2.4.2 --- pkgs/by-name/pl/plasma-panel-colorizer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix index 8e5de5a58e6d..c656b6c5f7fd 100644 --- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix +++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "plasma-panel-colorizer"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-colorizer"; tag = "v${finalAttrs.version}"; - hash = "sha256-YDYVjAbizmo1+E1DVeyISKM4Jb/HkKY/On9RanJBuvI="; + hash = "sha256-SQ2jf0YWmDN0Yce2lmTpD11zLdUz2otm98TO/agaY28="; }; nativeBuildInputs = [ From 2a9f456158afe0002e08369bf0c4637b6df0a489 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 04:29:58 +0000 Subject: [PATCH 143/240] sydbox: 3.32.6 -> 3.32.7 --- pkgs/by-name/sy/sydbox/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix index 69a2c5721c11..faff6b29ed50 100644 --- a/pkgs/by-name/sy/sydbox/package.nix +++ b/pkgs/by-name/sy/sydbox/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sydbox"; - version = "3.32.6"; + version = "3.32.7"; outputs = [ "out" @@ -24,11 +24,11 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Sydbox"; repo = "sydbox"; tag = "v${finalAttrs.version}"; - hash = "sha256-7tU1H8Du2O4Ay+isZwSUcx+Ws9gr0Djq5uQeRPCuQEo="; + hash = "sha256-l1CWCSd1ORw0Pvt9tcvbie5hEcysw0MoFhKxheIevEA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SukVs5VG7NEkwF78iliD0SZZgdT0Kz/yQV3LTBo2Nn0="; + cargoHash = "sha256-3eFYf8+ESNLBgV7thEWseocPQG7mCrjCt42FfzEnB6Q="; nativeBuildInputs = [ mandoc From 58045ca63be351c09d38e0aab93010fa4ccb6888 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 04:31:31 +0000 Subject: [PATCH 144/240] coroot: 1.9.9 -> 1.9.10 --- pkgs/by-name/co/coroot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix index 05c5a5dc8f81..dc170735861e 100644 --- a/pkgs/by-name/co/coroot/package.nix +++ b/pkgs/by-name/co/coroot/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "coroot"; - version = "1.9.9"; + version = "1.9.10"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot"; rev = "v${version}"; - hash = "sha256-pGNlXXggy32vnbbjGNCev8HzUltls1ElGVULPhOwoRQ="; + hash = "sha256-7ylShJhf1ZUK3JM8yV0WlSdJ3b/IOq4iq5+4pjdIGOw="; }; vendorHash = "sha256-wyxNT8g5TUCjlxauL7NmCf4HZ91V2nD64L1L/rYH864="; From a8e22f714590bd551277f45e3f57731781da2781 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 05:03:53 +0000 Subject: [PATCH 145/240] seagoat: 0.54.4 -> 0.54.6 --- pkgs/by-name/se/seagoat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/seagoat/package.nix b/pkgs/by-name/se/seagoat/package.nix index 9c86c5f5304e..2eedb9e44083 100644 --- a/pkgs/by-name/se/seagoat/package.nix +++ b/pkgs/by-name/se/seagoat/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication rec { pname = "seagoat"; - version = "0.54.4"; + version = "0.54.6"; pyproject = true; src = fetchFromGitHub { owner = "kantord"; repo = "SeaGOAT"; tag = "v${version}"; - hash = "sha256-vix/tecZfKPF2pMuaYhBa3Y0qh3DelWYpta8Qy0saUE="; + hash = "sha256-KEFA1DUfsJpeNkWui/WKazImGCSwTFlPD8qsGFJNtr0="; }; build-system = [ python3Packages.poetry-core ]; From aeb9237c1897dba714aaae10b18e8a7b8fab6e0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 05:08:10 +0000 Subject: [PATCH 146/240] nixpacks: 1.34.1 -> 1.35.0 --- pkgs/by-name/ni/nixpacks/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nixpacks/package.nix b/pkgs/by-name/ni/nixpacks/package.nix index a003f5eb65e5..71e128d01568 100644 --- a/pkgs/by-name/ni/nixpacks/package.nix +++ b/pkgs/by-name/ni/nixpacks/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.34.1"; + version = "1.35.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = "nixpacks"; rev = "v${version}"; - hash = "sha256-G3PIQfwddATVNhe/cEZBSFESX3grFqjUQjq40DB5mH4="; + hash = "sha256-lWd8y/gZTLza9WrIBSsqg0TUkmwzvcZE97kj+NnHrSI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-h6DoUCj7wjN/qiy0rsC2fCHhQ8hcmSwFu7zaRw9tCUs="; + cargoHash = "sha256-BuQNJTvL7vxAAS86ENTqgFbneaRo/W+C1rhTmF9BgUM="; # skip test due FHS dependency doCheck = false; From 8cdbae213440d1ca1034de026f7fc9a5a6152c03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 05:15:56 +0000 Subject: [PATCH 147/240] python312Packages.pycm: 4.2 -> 4.3 --- pkgs/development/python-modules/pycm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index 7d6a114c3451..416bd18a2c37 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pycm"; - version = "4.2"; + version = "4.3"; pyproject = true; src = fetchFromGitHub { owner = "sepandhaghighi"; repo = pname; tag = "v${version}"; - hash = "sha256-oceLARBP9D6NlMQiDvzIpJNNcod5D1O4xo3YzrUstso="; + hash = "sha256-JX75UEaONL+2n6xePE2hbIEMmnt0RknWNWgpbMwNyhw="; }; build-system = [ setuptools ]; From a6af2c59ee05e4d8190c2f6c56b098b18a380c2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 05:30:57 +0000 Subject: [PATCH 148/240] terraform-providers.doppler: 1.15.0 -> 1.16.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 85aa22a24bc4..fdfc259110eb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -399,13 +399,13 @@ "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" }, "doppler": { - "hash": "sha256-Gxeq6uAkLW2ZI6FcgLb08DHGr/kCaEXrrSI8C7God2Y=", + "hash": "sha256-VzdtksB/zrsf3z3J/1UEehiuQYM7cyxTef892PGYrxo=", "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", "owner": "DopplerHQ", "repo": "terraform-provider-doppler", - "rev": "v1.15.0", + "rev": "v1.16.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-riWi+l7MsqaatRbo74w0c+oB+8RB7F3VEx4cj/NX72A=" + "vendorHash": "sha256-B8mYLd4VdADWoQLWiCM85VQrBfDdlYQ0wkCp9eUBQ4U=" }, "elasticsearch": { "hash": "sha256-a6kHN3w0sQCP+0+ZtFwcg9erfVBYkhNo+yOrnwweGWo=", From 6312090ac18e91d24239116f559ee966df910fbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 05:44:59 +0000 Subject: [PATCH 149/240] checkstyle: 10.22.0 -> 10.23.0 --- pkgs/by-name/ch/checkstyle/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix index 47926b6b84c5..df8258233004 100644 --- a/pkgs/by-name/ch/checkstyle/package.nix +++ b/pkgs/by-name/ch/checkstyle/package.nix @@ -7,12 +7,12 @@ }: stdenvNoCC.mkDerivation rec { - version = "10.22.0"; + version = "10.23.0"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-U6QpASgCKxv3NTFINkJ9Aey4E9Y089RY5X2TNhSlIOs="; + sha256 = "sha256-4KMZ2WNntgMEjoOSECPko6zi89Zesb/t6oM+uZEKEDc="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From 8bf13446c134caf053f00b6f2522e1a8df627aa3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 05:54:59 +0000 Subject: [PATCH 150/240] python312Packages.llm-gemini: 0.16 -> 0.17 --- pkgs/development/python-modules/llm-gemini/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llm-gemini/default.nix b/pkgs/development/python-modules/llm-gemini/default.nix index 01a7dfd7bd89..b1e5bdc08c12 100644 --- a/pkgs/development/python-modules/llm-gemini/default.nix +++ b/pkgs/development/python-modules/llm-gemini/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { pname = "llm-gemini"; - version = "0.16"; + version = "0.17"; pyproject = true; src = fetchFromGitHub { owner = "simonw"; repo = "llm-gemini"; tag = version; - hash = "sha256-JtNFYEriiWi5fgIHM8hhMct4G7AdVKZhro9y40gxaZo="; + hash = "sha256-CF3kRrW1wV1JZC+spOmb2BFBKjFzvWG+vFIscZuVp2U="; }; build-system = [ From 6c11654908e9ea39f0c185f1ec3e36e8ab53f487 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 10 Apr 2025 08:28:42 +0200 Subject: [PATCH 151/240] openroad: move to by-name --- .../openroad/default.nix => by-name/op/openroad/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) rename pkgs/{applications/science/electronics/openroad/default.nix => by-name/op/openroad/package.nix} (98%) diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/by-name/op/openroad/package.nix similarity index 98% rename from pkgs/applications/science/electronics/openroad/default.nix rename to pkgs/by-name/op/openroad/package.nix index ef9db55ef3f5..98e2bee74f38 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/by-name/op/openroad/package.nix @@ -1,6 +1,5 @@ { lib, - mkDerivation, fetchFromGitHub, bison, cmake, @@ -44,7 +43,7 @@ let ]; }); in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "openroad"; version = "2.0-unstable-2025-03-01"; @@ -65,6 +64,7 @@ mkDerivation rec { gtest pkg-config swig + libsForQt5.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 079d5f75203f..c7986003936d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18505,8 +18505,6 @@ with pkgs; qcsxcad = libsForQt5.qcsxcad; }; - openroad = libsForQt5.callPackage ../applications/science/electronics/openroad { }; - qucs-s = qt6Packages.callPackage ../applications/science/electronics/qucs-s { }; xyce = callPackage ../applications/science/electronics/xyce { }; From f3f1f9fd0398a98d47c95761b0105ec5e90962dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Apr 2025 08:18:30 +0000 Subject: [PATCH 152/240] pkg: 2.0.6 -> 2.1.0 --- pkgs/by-name/pk/pkg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pk/pkg/package.nix b/pkgs/by-name/pk/pkg/package.nix index 8a3739410c4c..af42943ebc52 100644 --- a/pkgs/by-name/pk/pkg/package.nix +++ b/pkgs/by-name/pk/pkg/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkg"; - version = "2.0.6"; + version = "2.1.0"; src = fetchFromGitHub { owner = "freebsd"; repo = "pkg"; rev = finalAttrs.version; - hash = "sha256-NTjAhqCUN2bN4ilijoeHHIkl58XXP5nSj/yLUL0N2fw="; + hash = "sha256-tOHt5Ra628qg/4N7fkUnL/xq4qV6Vmv2vsJpwSaDba8="; }; setOutputFlags = false; From 1d7ef43685796545d6abf39f6f584fa72ba8e35e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 06:33:18 +0000 Subject: [PATCH 153/240] acpica-tools: R2024_12_12 -> R2025_04_04 --- pkgs/by-name/ac/acpica-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix index 7211b45c70ee..96a8a0d0a78a 100644 --- a/pkgs/by-name/ac/acpica-tools/package.nix +++ b/pkgs/by-name/ac/acpica-tools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "acpica-tools"; - version = "R2024_12_12"; + version = "R2025_04_04"; src = fetchFromGitHub { owner = "acpica"; repo = "acpica"; tag = finalAttrs.version; - hash = "sha256-vxiWYUAEk54F1M0WrrMTHZ4DNJxxT/GaXetd5LjE808="; + hash = "sha256-+dMuyp3tT0eSLPyzLseuHMY+nNfl6roBFrsnXiZSHkY="; }; nativeBuildInputs = [ From de68ba78026199a44e1d74179ef279860c149095 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 10 Apr 2025 08:33:04 +0200 Subject: [PATCH 154/240] openroad: cleanup --- pkgs/by-name/op/openroad/package.nix | 118 ++++++++++++++------------- 1 file changed, 60 insertions(+), 58 deletions(-) diff --git a/pkgs/by-name/op/openroad/package.nix b/pkgs/by-name/op/openroad/package.nix index 98e2bee74f38..2023f2606825 100644 --- a/pkgs/by-name/op/openroad/package.nix +++ b/pkgs/by-name/op/openroad/package.nix @@ -1,48 +1,44 @@ { lib, + stdenv, fetchFromGitHub, + + # nativeBuildInputs bison, cmake, doxygen, flex, - git, - python3, + gitMinimal, + gtest, + libsForQt5, + pkg-config, swig, + + # buildInputs boost186, # 1.87.0 broken https://github.com/boostorg/asio/issues/442 cbc, # for clp cimg, clp, # for or-tools cudd, eigen, - gtest, glpk, lcov, lemon-graph, - libsForQt5, libjpeg, or-tools, pcre, - pkg-config, + python3, re2, # for or-tools readline, spdlog, tcl, tclPackages, - xorg, yosys, zlib, + xorg, llvmPackages, - stdenv, }: -let - or-tools-static = or-tools.overrideAttrs (oldAttrs: { - cmakeFlags = oldAttrs.cmakeFlags ++ [ - # https://github.com/google/or-tools/issues/3709 - "-DBUILD_SHARED_LIBS=OFF" - ]; - }); -in stdenv.mkDerivation rec { pname = "openroad"; version = "2.0-unstable-2025-03-01"; @@ -60,40 +56,42 @@ stdenv.mkDerivation rec { cmake doxygen flex - git + gitMinimal gtest + libsForQt5.wrapQtAppsHook pkg-config swig - libsForQt5.wrapQtAppsHook ]; - buildInputs = [ - boost186 - cbc - cimg - clp - cudd - eigen - glpk - lcov - lemon-graph - libjpeg - or-tools-static - pcre - python3 - libsForQt5.qtbase - libsForQt5.qtcharts - libsForQt5.qtsvg - libsForQt5.qtdeclarative - re2 - readline - spdlog - tcl - tclPackages.tclreadline - yosys - xorg.libX11 - zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; + buildInputs = + [ + boost186 + cbc + cimg + clp + cudd + eigen + glpk + lcov + lemon-graph + libjpeg + libsForQt5.qtbase + libsForQt5.qtcharts + libsForQt5.qtdeclarative + libsForQt5.qtsvg + or-tools + pcre + python3 + re2 + readline + spdlog + tcl + tclPackages.tclreadline + yosys + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; postPatch = '' patchShebangs --build etc/find_messages.py @@ -103,18 +101,18 @@ stdenv.mkDerivation rec { cmakeFlags = [ - "-DENABLE_TESTS=ON" - "-DUSE_SYSTEM_BOOST=ON" - "-DUSE_SYSTEM_ABC=OFF" - "-DABC_SKIP_TESTS=ON" # it attempts to download gtest - "-DUSE_SYSTEM_OPENSTA=OFF" - "-DOPENROAD_VERSION=${version}_${src.rev}" - "-DCMAKE_RULE_MESSAGES=OFF" - "-DTCL_HEADER=${tcl}/include/tcl.h" - "-DTCL_LIBRARY=${tcl}/lib/libtcl${stdenv.hostPlatform.extensions.sharedLibrary}" + (lib.cmakeBool "ENABLE_TESTS" true) + (lib.cmakeBool "USE_SYSTEM_BOOST" true) + (lib.cmakeBool "USE_SYSTEM_ABC" false) + (lib.cmakeBool "ABC_SKIP_TESTS" true) # it attempts to download gtest + (lib.cmakeBool "USE_SYSTEM_OPENSTA" false) + (lib.cmakeFeature "OPENROAD_VERSION" "${version}_${src.rev}") + (lib.cmakeBool "CMAKE_RULE_MESSAGES" false) + (lib.cmakeFeature "TCL_HEADER" "${tcl}/include/tcl.h") + (lib.cmakeFeature "TCL_LIBRARY" "${tcl}/lib/libtcl${stdenv.hostPlatform.extensions.sharedLibrary}") ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DCMAKE_CXX_FLAGS=-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED" + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED") ]; # Resynthesis needs access to the Yosys binaries. @@ -130,18 +128,22 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = '' + runHook preInstallCheck + $out/bin/openroad -version $out/bin/sta -version + + runHook postInstallCheck ''; - meta = with lib; { + meta = { description = "OpenROAD's unified application implementing an RTL-to-GDS flow"; homepage = "https://theopenroadproject.org"; - license = licenses.bsd3; - maintainers = with maintainers; [ + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ trepetti hzeller ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } From c2313ca2eceb407ef88c71d0a7039e78de9d75a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 07:33:54 +0000 Subject: [PATCH 155/240] civo: 1.1.99 -> 1.2.0 --- pkgs/by-name/ci/civo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix index 7aac936bfe5a..a565a497adc3 100644 --- a/pkgs/by-name/ci/civo/package.nix +++ b/pkgs/by-name/ci/civo/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "civo"; - version = "1.1.99"; + version = "1.2.0"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - hash = "sha256-30uv9vVjfjZWsUhwrgY7TYs8cAkv+v/TdsSW+VmupJM="; + hash = "sha256-T4xAWEXynkj++jS/7OjA/kT9Wk396IRXm3ikSA5q3Fo="; }; vendorHash = "sha256-c4KyK0HtIW08/DQ6PLgA+M8GABrKHjAayZahkvo/Erc="; From d35b44a477bb1cf519c4c45e9f886ca795dd2eba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 08:06:24 +0000 Subject: [PATCH 156/240] morgen: 3.6.10 -> 3.6.11 --- pkgs/by-name/mo/morgen/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/morgen/package.nix b/pkgs/by-name/mo/morgen/package.nix index af0a0de53770..048c9ed7710e 100644 --- a/pkgs/by-name/mo/morgen/package.nix +++ b/pkgs/by-name/mo/morgen/package.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.6.10"; + version = "3.6.11"; src = fetchurl { name = "morgen-${version}.deb"; url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-//HXWx0vi2lbCeZr+QMfif6B8MiCAdRDullQ1QlIZu8="; + hash = "sha256-vn3V7TXWMPesZt+65FAeNzUo8n4P9XfSIFnCDvLaZOI="; }; nativeBuildInputs = [ From cb3018882f13c5bfc835b46825fd0f2c532d7017 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 31 Mar 2025 21:00:00 +0200 Subject: [PATCH 157/240] vacuum-go: use finalAttrs pattern --- pkgs/by-name/va/vacuum-go/package.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index c5da16a18cfd..cc6819cad37b 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -3,10 +3,9 @@ buildGoModule, fetchFromGitHub, testers, - vacuum-go, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "vacuum-go"; version = "0.16.5"; @@ -14,7 +13,7 @@ buildGoModule rec { owner = "daveshanley"; repo = "vacuum"; # using refs/tags because simple version gives: 'the given path has multiple possibilities' error - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-r42bmY7wmEjA2Q/k8czyyNpU59a4z6vxeCnIfMkMScg="; }; @@ -24,25 +23,25 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.version=v${version}" + "-X main.version=v${finalAttrs.version}" ]; subPackages = [ "./vacuum.go" ]; passthru = { tests.version = testers.testVersion { - package = vacuum-go; + package = finalAttrs.finalPackage; command = "vacuum version"; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; }; meta = { description = "The world's fastest OpenAPI & Swagger linter"; homepage = "https://quobix.com/vacuum"; - changelog = "https://github.com/daveshanley/vacuum/releases/tag/v${version}"; + changelog = "https://github.com/daveshanley/vacuum/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; mainProgram = "vacuum"; maintainers = with lib.maintainers; [ konradmalik ]; }; -} +}) From d7fe60b4ef7c9b9b0412413633da825c7cae396d Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 9 Apr 2025 18:20:46 +0200 Subject: [PATCH 158/240] peertube: 6.3.3 -> 7.0.1 --- pkgs/by-name/pe/peertube/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix index 62cf67072afa..0f99e03bab15 100644 --- a/pkgs/by-name/pe/peertube/package.nix +++ b/pkgs/by-name/pe/peertube/package.nix @@ -48,33 +48,33 @@ let in stdenv.mkDerivation rec { pname = "peertube"; - version = "6.3.3"; + version = "7.0.1"; src = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; tag = "v${version}"; - hash = "sha256-kPZcCJtnoqE1g0fAuM98IhuDy1E9QBDkFNWrWIpFIDA="; + hash = "sha256-DoUSzqb8lrU+s5R95rxCN/5A8sgb11edAhv0T6YACRo="; }; yarnOfflineCacheServer = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-I6TC5KO+NQ0NAtoJzYQPLelp8/hYUtIeof+UI45qpdk="; + hash = "sha256-WLaIIyz6SEekLFeVO39Swpny5/x5Jc1zoxy/6bmOXTk="; }; yarnOfflineCacheClient = fetchYarnDeps { yarnLock = "${src}/client/yarn.lock"; - hash = "sha256-ADck9+5TDZ3OGInZ+NYYpBg9XXHugtiwyxYCYqSIOzM="; + hash = "sha256-/ZdORSnwk29ubsgKKB7RfHCetODNOH9DzkflQdDsMz0="; }; yarnOfflineCacheAppsCli = fetchYarnDeps { yarnLock = "${src}/apps/peertube-cli/yarn.lock"; - hash = "sha256-t5MwysPVLbtIfDhvnwWoGocck1ntP8OP9Vf9DF6L7Cg="; + hash = "sha256-lcWtZGE/6XGm8KXmzSowCHAb/vGwBoqkwk32Ru3mMYU="; }; yarnOfflineCacheAppsRunner = fetchYarnDeps { yarnLock = "${src}/apps/peertube-runner/yarn.lock"; - hash = "sha256-x5qFCprn8q0xC88HudLV7W53X1Nkbz3F52RMp2PxIu8="; + hash = "sha256-R7oXJUT698l2D1WkQGTWfkmbC7bC1XJ04xT0O8bwuI8="; }; outputs = [ From 92ad8c1e2cbb1294a105be44c50b4d292beb644d Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 17 Feb 2025 21:28:06 +0300 Subject: [PATCH 159/240] syndicate-server: 0.48.0 -> 0.50.1 --- pkgs/by-name/sy/syndicate-server/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syndicate-server/package.nix b/pkgs/by-name/sy/syndicate-server/package.nix index 51df682001f9..480de7622fed 100644 --- a/pkgs/by-name/sy/syndicate-server/package.nix +++ b/pkgs/by-name/sy/syndicate-server/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "syndicate-server"; - version = "0.48.0"; + version = "0.50.1"; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "syndicate-lang"; repo = "syndicate-rs"; rev = "${pname}-v${version}"; - hash = "sha256-DVgFlJCqaTmQ7eL2LQ8rkIbvaEfwx+NDeXRA8qB+/Qo="; + hash = "sha256-orQN83DE+ZNgdx2PVcYrte/rVDFFtuQuRDKzeumpsLo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-P/NYyoH/9kkyBwCGORK9bxEjyye12SP3hRDnL9c6i78="; + cargoHash = "sha256-lR36UAMedPdfvX613adxxRzJe+Ri09hiZYanyu7xbLU="; nativeBuildInputs = [ pkg-config versionCheckHook @@ -27,6 +27,7 @@ rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; + doCheck = false; doInstallCheck = true; meta = { From 57c4b0c0d2de4dd7d3fcd1d4c30e2d0fdc53add1 Mon Sep 17 00:00:00 2001 From: eljamm Date: Thu, 10 Apr 2025 10:38:15 +0200 Subject: [PATCH 160/240] icestudio: fix maintainers --- pkgs/by-name/ic/icestudio/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ic/icestudio/package.nix b/pkgs/by-name/ic/icestudio/package.nix index c1f3d027e7b4..37255829871d 100644 --- a/pkgs/by-name/ic/icestudio/package.nix +++ b/pkgs/by-name/ic/icestudio/package.nix @@ -118,7 +118,7 @@ buildNpmPackage rec { rcoeurjoly amerino ] - ++ [ lib.teams.ngi ]; + ++ lib.teams.ngi.members; mainProgram = "icestudio"; platforms = lib.platforms.linux; }; From 6bdcbde9b056a5a2a1ec98cc840fab44ff79db63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 08:59:01 +0000 Subject: [PATCH 161/240] python312Packages.databricks-sql-connector: 4.0.1 -> 4.0.2 --- .../python-modules/databricks-sql-connector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index 7036309323e7..2cc4e91fb962 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "4.0.1"; + version = "4.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "databricks"; repo = "databricks-sql-python"; tag = "v${version}"; - hash = "sha256-/CWaWjDlgmaUY4Z6Nb0qfQ6gQR6u4FxkM/B/nOfAAYo="; + hash = "sha256-zrEbenakeaFd6/DkmtHDjw9zgl6FxEXmBGTT7pFvUVU="; }; pythonRelaxDeps = [ From 9eb5812580413a61a32f1fd08c3c4076ff8f8e9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Apr 2025 22:05:06 +0000 Subject: [PATCH 162/240] crosvm: 0-unstable-2025-03-27 -> 0-unstable-2025-04-07 --- pkgs/by-name/cr/crosvm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix index 16aa5fd8d4f5..5453a266f42e 100644 --- a/pkgs/by-name/cr/crosvm/package.nix +++ b/pkgs/by-name/cr/crosvm/package.nix @@ -21,12 +21,12 @@ rustPlatform.buildRustPackage { pname = "crosvm"; - version = "0-unstable-2025-03-27"; + version = "0-unstable-2025-04-07"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "779126e8670cb471fc35e07c9f6a958638bbd9e3"; - hash = "sha256-xYd4KSLcuc1u6JV67UgW9FgkQGwQZLjlvpmngnWc0ew="; + rev = "7cb0f63341ca728c2d0f53c94fadfd20dd307186"; + hash = "sha256-xEKOEEGyfrfCGzI2+brkVwHcKKKLctNU+adgzVNGses="; fetchSubmodules = true; }; From e448c5584c1527d5e7b8f52ef9ffbc048379b15a Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 10 Apr 2025 11:22:11 +0200 Subject: [PATCH 163/240] Revert "netexec: fix eval" This reverts commit bf1c61d16adf3ba583d4bdeafa309b01a9e15edf. --- pkgs/tools/security/netexec/default.nix | 67 ++++++++++--------------- 1 file changed, 27 insertions(+), 40 deletions(-) diff --git a/pkgs/tools/security/netexec/default.nix b/pkgs/tools/security/netexec/default.nix index c8741909129e..0b7913cd8657 100644 --- a/pkgs/tools/security/netexec/default.nix +++ b/pkgs/tools/security/netexec/default.nix @@ -2,44 +2,30 @@ lib, stdenv, fetchFromGitHub, - buildPythonApplication, - pytestCheckHook, - # Deps - poetry-core, - poetry-dynamic-versioning, - aardwolf, - aioconsole, - aiosqlite, - argcomplete, - asyauth, - beautifulsoup4, - bloodhound-py, - dploot, - dsinternals, - lsassy, - masky, - minikerberos, - msgpack, - msldap, - neo4j, - paramiko, - pyasn1-modules, - pylnk3, - pynfsclient, - pypsrp, - pypykatz, - python-dateutil, - python-libnmap, - pywerview, - requests, - rich, - sqlalchemy, - termcolor, - terminaltables, - xmltodict, - impacket, + python3, }: -buildPythonApplication rec { +let + python = python3.override { + self = python; + packageOverrides = self: super: { + impacket = super.impacket.overridePythonAttrs { + version = "0.12.0.dev1-unstable-2023-11-30"; + src = fetchFromGitHub { + owner = "Pennyw0rth"; + repo = "impacket"; + rev = "d370e6359a410063b2c9c68f6572c3b5fb178a38"; + hash = "sha256-Jozn4lKAnLQ2I53+bx0mFY++OH5P4KyqVmrS5XJUY3E="; + }; + # Fix version to be compliant with Python packaging rules + postPatch = '' + substituteInPlace setup.py \ + --replace 'version="{}.{}.{}.{}{}"' 'version="{}.{}.{}"' + ''; + }; + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "netexec"; version = "1.3.0"; pyproject = true; @@ -64,12 +50,12 @@ buildPythonApplication rec { --replace-fail '{ git = "https://github.com/Pennyw0rth/NfsClient" }' '"*"' ''; - build-system = [ + build-system = with python.pkgs; [ poetry-core poetry-dynamic-versioning ]; - dependencies = [ + dependencies = with python.pkgs; [ aardwolf aioconsole aiosqlite @@ -79,6 +65,7 @@ buildPythonApplication rec { bloodhound-py dploot dsinternals + impacket lsassy masky minikerberos @@ -102,7 +89,7 @@ buildPythonApplication rec { xmltodict ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = with python.pkgs; [ pytestCheckHook ]; # Tests no longer works out-of-box with 1.3.0 doCheck = false; From 9589938fa52cbcb06caed88467ca0311fd99e254 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 10 Apr 2025 11:22:36 +0200 Subject: [PATCH 164/240] netexec: migrate to by-name --- .../netexec/default.nix => by-name/ne/netexec/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/netexec/default.nix => by-name/ne/netexec/package.nix} (100%) diff --git a/pkgs/tools/security/netexec/default.nix b/pkgs/by-name/ne/netexec/package.nix similarity index 100% rename from pkgs/tools/security/netexec/default.nix rename to pkgs/by-name/ne/netexec/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad4ad32cc674..a92e18259565 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4181,8 +4181,6 @@ with pkgs; nanoemoji = with python3Packages; toPythonApplication nanoemoji; - netexec = callPackage ../tools/security/netexec { }; - netdata = callPackage ../tools/system/netdata { protobuf = protobuf_21; }; From be9745ee72c0dd42c1ca63861a1c9753eff4649b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 09:44:36 +0000 Subject: [PATCH 165/240] python312Packages.petl: 1.7.15 -> 1.7.16 --- pkgs/development/python-modules/petl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/petl/default.nix b/pkgs/development/python-modules/petl/default.nix index a881bf260a35..188bbeba821f 100644 --- a/pkgs/development/python-modules/petl/default.nix +++ b/pkgs/development/python-modules/petl/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "petl"; - version = "1.7.15"; + version = "1.7.16"; pyproject = true; src = fetchFromGitHub { owner = "petl-developers"; repo = "petl"; tag = "v${version}"; - hash = "sha256-zTE6s19/xcu7noT+qQXYrJ8ldrSQVi3AunDKoOMB2Qs="; + hash = "sha256-rew/+GXQq2l1LlsR4yqHJZ/iY21HJ2Lf86KS55L8jsQ="; }; build-system = [ From 6c94a68c58c844bc90cf6b4a392fc0604933d7d8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 5 Mar 2025 15:35:58 +0100 Subject: [PATCH 166/240] or-tools: move to by-name --- ...1-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch | 0 .../or-tools/default.nix => by-name/or/or-tools/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/libraries/science/math => by-name/or}/or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch (100%) rename pkgs/{development/libraries/science/math/or-tools/default.nix => by-name/or/or-tools/package.nix} (100%) diff --git a/pkgs/development/libraries/science/math/or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch b/pkgs/by-name/or/or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch similarity index 100% rename from pkgs/development/libraries/science/math/or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch rename to pkgs/by-name/or/or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/by-name/or/or-tools/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/or-tools/default.nix rename to pkgs/by-name/or/or-tools/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99c189b702a0..11f192274081 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18155,7 +18155,7 @@ with pkgs; nodejs = nodejs_20; }; - or-tools = callPackage ../development/libraries/science/math/or-tools { + or-tools = callPackage ../by-name/or/or-tools/package.nix { inherit (darwin) DarwinTools; python = python3; protobuf = protobuf_29.override { From 50de181003666e89a828e0fae59a83044d012292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 10 Apr 2025 10:45:53 +0100 Subject: [PATCH 167/240] cachix: 1.7.7 -> 1.7.8 --- .../haskell-modules/configuration-common.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 40ba605fe792..c3ec333ba589 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -549,24 +549,24 @@ self: super: # Manually maintained cachix-api = overrideCabal (drv: { - version = "1.7.7"; + version = "1.7.8"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.7.7"; - hash = "sha256-D0gP8srrX0qj+wNYNPdtVJsQuFzIng3q43thnHXQ/es="; + tag = "v1.7.8"; + hash = "sha256-pb5aYkE8FOoa4n123slgHiOf1UbNSnKe5pEZC+xXD5g="; }; postUnpack = "sourceRoot=$sourceRoot/cachix-api"; }) super.cachix-api; cachix = ( overrideCabal (drv: { - version = "1.7.7"; + version = "1.7.8"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.7.7"; - hash = "sha256-D0gP8srrX0qj+wNYNPdtVJsQuFzIng3q43thnHXQ/es="; + tag = "v1.7.8"; + hash = "sha256-pb5aYkE8FOoa4n123slgHiOf1UbNSnKe5pEZC+xXD5g="; }; postUnpack = "sourceRoot=$sourceRoot/cachix"; }) From af130992bae9cc56e799512812b85b0fa118f17a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 09:35:11 +0000 Subject: [PATCH 168/240] vscode-extensions.rooveterinaryinc.roo-cline: 3.11.9 -> 3.11.12 --- .../vscode/extensions/rooveterinaryinc.roo-cline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index e4562b1713e7..1056575f1476 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "RooVeterinaryInc"; name = "roo-cline"; - version = "3.11.9"; - hash = "sha256-+Bi9nHRXXZGKGvTS8o0CbtS6KBJmQz+Wiiinqs16vZA="; + version = "3.11.12"; + hash = "sha256-f7IPxeF/UxywMm8yVEZV/sHTKILZ3n788bhwH4xx89I="; }; passthru.updateScript = vscode-extensions-update-script { }; From 4a1dd30cdf1e22727b23c3048994e9cf49f18479 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 10:58:50 +0000 Subject: [PATCH 169/240] prometheus-knot-exporter: 3.4.5 -> 3.4.6 --- pkgs/servers/monitoring/prometheus/knot-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index 5d6dc3e0e57b..32ba7d411c3f 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "3.4.5"; + version = "3.4.6"; pyproject = true; src = fetchPypi { pname = "knot_exporter"; inherit version; - hash = "sha256-OD8Z2xdRydEp3TeXX9l0ASus+c3YziGF50tn7QOugUE="; + hash = "sha256-OMBg7sjFU3GpVKiXNWVBr4Oa1v4MTr1jZMrR7MhzgVg="; }; nativeBuildInputs = [ From 518f6ee7e7cd17dbdb8c3da73a4938b0954d8fa3 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 10 Apr 2025 11:22:36 +0200 Subject: [PATCH 170/240] pscale: fix cross build --- pkgs/by-name/ps/pscale/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index ffbd140a6627..8a6829654626 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -1,4 +1,5 @@ { + stdenv, buildGoModule, fetchFromGitHub, installShellFiles, @@ -30,7 +31,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd pscale \ --bash <($out/bin/pscale completion bash) \ --fish <($out/bin/pscale completion fish) \ From 837f302dcf2b274e6dc038d62b6e7809e89e2fc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 11:20:26 +0000 Subject: [PATCH 171/240] goperf: 0-unstable-2025-03-05 -> 0-unstable-2025-04-07 --- pkgs/by-name/go/goperf/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/go/goperf/package.nix b/pkgs/by-name/go/goperf/package.nix index 06fef208efbb..c5f97eafa6dc 100644 --- a/pkgs/by-name/go/goperf/package.nix +++ b/pkgs/by-name/go/goperf/package.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "goperf"; - version = "0-unstable-2025-03-05"; + version = "0-unstable-2025-04-07"; src = fetchgit { url = "https://go.googlesource.com/perf"; - rev = "02a15fd477bac975be19f213ea665ad854766179"; - hash = "sha256-8v26SVtBbUNrBhBjcLM1RKVcgXmC9CFWWOBZ5pc1RfM="; + rev = "71ba5bc8ccce8a755de82e9bad6ca4e4d7b590d2"; + hash = "sha256-xY9Z502YUUePqoocBWWPxD/TLFQtYq3TLyj3Izp8n9A="; }; - vendorHash = "sha256-3ocSlOVE1hskLqshBeseoB+Wjuu9QJhhzshQUuygcQ0="; + vendorHash = "sha256-BYfn9ip8QCS+spYR51eS6SysYlZtBZf7GhuFZVh3Kb8="; passthru.updateScript = writeShellScript "update-goperf" '' export UPDATE_NIX_ATTR_PATH=goperf From d7aa2d7d7b2665d66786cae0bc83c00f6942bc8f Mon Sep 17 00:00:00 2001 From: misilelab Date: Thu, 10 Apr 2025 20:24:21 +0900 Subject: [PATCH 172/240] fastfetch: 2.40.3 -> 2.40.4 https://github.com/fastfetch-cli/fastfetch/releases/tag/2.40.4 Signed-off-by: misilelab --- pkgs/by-name/fa/fastfetch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 6ca2fbc6ea8e..913e8fe8378d 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -45,13 +45,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.40.3"; + version = "2.40.4"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-iGrUBhomnn5880lrjtLK7OEG7R2ZvpoM4fBauxUGECc="; + hash = "sha256-s9QIjN4x1wovnq3eOQEyWhqSK1nlefGnnC9n356qEE4="; }; outputs = [ From 826e090a3bea817f33132ecdfa42da82f26302bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 11:40:07 +0000 Subject: [PATCH 173/240] usql: 0.19.19 -> 0.19.21 --- pkgs/by-name/us/usql/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix index 4679440cf830..34ffa9971475 100644 --- a/pkgs/by-name/us/usql/package.nix +++ b/pkgs/by-name/us/usql/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "usql"; - version = "0.19.19"; + version = "0.19.21"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; tag = "v${version}"; - hash = "sha256-IDCF/etK9mNjdcgQWEDj9tXP12c2CcEA2RamKlCXgRE="; + hash = "sha256-Ix1+uq5TpYp6JyT2KML8Ts/ElPeQCKz9qAW9DqQahbE="; }; buildInputs = [ @@ -25,7 +25,7 @@ buildGoModule rec { icu ]; - vendorHash = "sha256-Z1Mjc+sI+8VHO9TTXUzF4yRvCtDs4sr/dGtjacXWCfE="; + vendorHash = "sha256-YXpmzIPs6gvEspC9JrGHw4Yzs8wdtBTsGU9kTOT6c+0="; proxyVendor = true; # Exclude drivers from the bad group From 44739c7d052b0c3a046e6bb4da21a50e27dcfce0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Apr 2025 13:53:26 +0200 Subject: [PATCH 174/240] python313Packages.tencentcloud-sdk-python: 3.0.1356 -> 3.0.1357 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1356...3.0.1357 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1357/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index cbc33570fbec..231149ff407e 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1356"; + version = "3.0.1357"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-sxmrymOkZCfvb1THOHNOz0PLv5MigcJeZsZ4UylgTG0="; + hash = "sha256-0rk7BUXwqVbULspF+uJ7c/RTE6k0bjKymXrEZDV+0UM="; }; build-system = [ setuptools ]; From 881e4bb2134e0bb44c1754278ae93d5fe8a4272d Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Thu, 10 Apr 2025 11:49:04 +0000 Subject: [PATCH 175/240] uv: 0.6.13 -> 0.6.14 Changelog: https://github.com/astral-sh/uv/blob/0.6.14/CHANGELOG.md Diff: https://github.com/astral-sh/uv/compare/refs/tags/0.6.13..0.6.14 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 24ee7fbd4f40..6542c21fd422 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.6.13"; + version = "0.6.14"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-vJvF8ioEtiriWh120WhMxkYSody04PuXA6EISjWWvYA="; + hash = "sha256-1ZmH757yqzXCYYRJoNGzh2Jy5ACWjNHugcY0szztBRQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-pwbqYe2zdQJQGoqrIwryBHmnS8spPgQ0qdpmxdT+9sk="; + cargoHash = "sha256-zE6WP5rFUvx6B3ti5mlXPD4Z+1VQM0qpaScszKjTNmY="; buildInputs = [ rust-jemalloc-sys From fdca1afe18597ded9e6e680dcda970cdc54a1d2e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Apr 2025 13:55:00 +0200 Subject: [PATCH 176/240] exploitdb: 2025-04-08 -> 2025-04-10 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2025-04-08...2025-04-10 --- pkgs/by-name/ex/exploitdb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index f9fa72114747..fc8f061b46de 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2025-04-08"; + version = "2025-04-10"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-xo9DhcQyigfAOF/yn46U09YMr8jlbJZp93wwJ4btr6Y="; + hash = "sha256-vbcFCeQv1ZQX/SI6LAr04L2ncaE8fcI7TATfwCRNcQA="; }; nativeBuildInputs = [ makeWrapper ]; From 150620cef008e6e8748f82f13da7e4456a1cac4d Mon Sep 17 00:00:00 2001 From: Louis Thevenet Date: Thu, 10 Apr 2025 13:57:40 +0200 Subject: [PATCH 177/240] searxng: 0-unstable-2025-02-09 -> 0-unstable-2025-04-09 --- pkgs/by-name/se/searxng/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 264dc4473f28..9e8307b0d48e 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -37,13 +37,13 @@ in python.pkgs.toPythonModule ( python.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "0-unstable-2025-02-09"; + version = "0-unstable-2025-04-09"; src = fetchFromGitHub { owner = "searxng"; repo = "searxng"; - rev = "a1e2b254677a22f1f8968a06564661ac6203c162"; - hash = "sha256-DrSj1wQUWq9xVuQqt0BZ79JgyRS9qJqg1cdYTIBb1A8="; + rev = "15384e8fc596da9c4a7e27393f8100018c3a61ed"; + hash = "sha256-exkn/gQALJteUAsg3qeSnRGEbKANkhSBDziWUgJ1fF8="; }; postPatch = '' From 68ae051ca534be9b89353f9f0e0b09ac58a30fa6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 5 Mar 2025 15:53:28 +0100 Subject: [PATCH 178/240] or-tools: cleanup --- pkgs/by-name/or/or-tools/package.nix | 81 ++++++++++++++-------------- pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 42 insertions(+), 43 deletions(-) diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix index 4457003bbadf..2443016c304c 100644 --- a/pkgs/by-name/or/or-tools/package.nix +++ b/pkgs/by-name/or/or-tools/package.nix @@ -3,7 +3,6 @@ bzip2, cbc, cmake, - DarwinTools, # sw_vers eigen, ensureNewerSourcesForZipFilesHook, fetchFromGitHub, @@ -13,7 +12,7 @@ lib, pkg-config, protobuf, - python, + python3, re2, stdenv, swig, @@ -21,14 +20,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "or-tools"; version = "9.12"; src = fetchFromGitHub { owner = "google"; repo = "or-tools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5rFeAK51+BfjIyu/5f5ptaKMD7Hd20yHa2Vj3O3PkLU="; }; @@ -62,18 +61,22 @@ stdenv.mkDerivation rec { sed -i -e "/protobuf/ { s/.*,/'protobuf >= 5.26',/ }" ortools/python/setup.py.in ''; - cmakeFlags = [ - "-DBUILD_DEPS=OFF" - "-DBUILD_PYTHON=ON" - "-DBUILD_pybind11=OFF" - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DFETCH_PYTHON_DEPS=OFF" - "-DUSE_GLPK=ON" - "-DUSE_SCIP=OFF" - "-DPython3_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ]; + cmakeFlags = + [ + (lib.cmakeBool "BUILD_DEPS" false) + (lib.cmakeBool "BUILD_PYTHON" true) + (lib.cmakeBool "BUILD_pybind11" false) + (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeBool "FETCH_PYTHON_DEPS" false) + (lib.cmakeBool "USE_GLPK" true) + (lib.cmakeBool "USE_SCIP" false) + (lib.cmakeFeature "Python3_EXECUTABLE" "${python3.pythonOnBuildForHost.interpreter}") + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.cmakeBool "CMAKE_MACOSX_RPATH" false) + ]; strictDeps = true; @@ -82,14 +85,11 @@ stdenv.mkDerivation rec { cmake ensureNewerSourcesForZipFilesHook pkg-config - python.pythonOnBuildForHost + python3.pythonOnBuildForHost swig unzip ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - DarwinTools - ] - ++ (with python.pythonOnBuildForHost.pkgs; [ + ++ (with python3.pythonOnBuildForHost.pkgs; [ pip mypy-protobuf mypy @@ -100,14 +100,15 @@ stdenv.mkDerivation rec { cbc eigen glpk - python.pkgs.absl-py - python.pkgs.pybind11 - python.pkgs.pybind11-abseil - python.pkgs.pybind11-protobuf - python.pkgs.pytest - python.pkgs.scipy - python.pkgs.setuptools - python.pkgs.wheel + highs + python3.pkgs.absl-py + python3.pkgs.pybind11 + python3.pkgs.pybind11-abseil + python3.pkgs.pybind11-protobuf + python3.pkgs.pytest + python3.pkgs.scipy + python3.pkgs.setuptools + python3.pkgs.wheel re2 zlib ]; @@ -115,14 +116,14 @@ stdenv.mkDerivation rec { abseil-cpp highs protobuf - (python.pkgs.protobuf.override { protobuf = protobuf; }) - python.pkgs.numpy - python.pkgs.pandas - python.pkgs.immutabledict + (python3.pkgs.protobuf.override { protobuf = protobuf; }) + python3.pkgs.immutabledict + python3.pkgs.numpy + python3.pkgs.pandas ]; nativeCheckInputs = [ - python.pkgs.matplotlib - python.pkgs.virtualenv + python3.pkgs.matplotlib + python3.pkgs.virtualenv ]; # some tests fail on linux and hang on darwin @@ -147,14 +148,14 @@ stdenv.mkDerivation rec { "python" ]; - meta = with lib; { + meta = { homepage = "https://github.com/google/or-tools"; - license = licenses.asl20; + license = lib.licenses.asl20; description = '' Google's software suite for combinatorial optimization. ''; mainProgram = "fzn-cp-sat"; - maintainers = with maintainers; [ andersk ]; - platforms = with platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ andersk ]; + platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11f192274081..600fb95c219e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18156,8 +18156,6 @@ with pkgs; }; or-tools = callPackage ../by-name/or/or-tools/package.nix { - inherit (darwin) DarwinTools; - python = python3; protobuf = protobuf_29.override { abseil-cpp = abseil-cpp_202407; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9bd03dc24f39..6f373e1d71d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10441,7 +10441,7 @@ self: super: with self; { ormsgpack = callPackage ../development/python-modules/ormsgpack { }; - ortools = (toPythonModule (pkgs.or-tools.override { inherit (self) python; })).python; + ortools = (toPythonModule (pkgs.or-tools.override { python3 = self.python; })).python; orvibo = callPackage ../development/python-modules/orvibo { }; From 05304f5bbb9d629836d284e22ff386438a86970f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 10 Apr 2025 13:55:47 +0200 Subject: [PATCH 179/240] or-tools: unpin protobuf and abseil --- pkgs/by-name/or/or-tools/package.nix | 2 +- pkgs/top-level/all-packages.nix | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix index 2443016c304c..7e01246887bd 100644 --- a/pkgs/by-name/or/or-tools/package.nix +++ b/pkgs/by-name/or/or-tools/package.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { abseil-cpp highs protobuf - (python3.pkgs.protobuf.override { protobuf = protobuf; }) + python3.pkgs.protobuf python3.pkgs.immutabledict python3.pkgs.numpy python3.pkgs.pandas diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 600fb95c219e..92a60a68aa97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18155,13 +18155,6 @@ with pkgs; nodejs = nodejs_20; }; - or-tools = callPackage ../by-name/or/or-tools/package.nix { - protobuf = protobuf_29.override { - abseil-cpp = abseil-cpp_202407; - }; - abseil-cpp = abseil-cpp_202407; - }; - p4est-sc = callPackage ../development/libraries/science/math/p4est-sc { p4est-sc-debugEnable = false; }; From c14ed78ea34831e8fbc3614b9aa98c3319e6aca3 Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Thu, 10 Apr 2025 17:07:43 +0530 Subject: [PATCH 180/240] cosmic-osd: substitue path for `audio-volume-change.oga` file The path `/usr/share/sounds/freedesktop/stereo/audio-volume-change.oga` is not accessible on NixOS because the directory `/usr` does not exist on NixOS. But the `audio-volume-change.oga` file is available in the `sound-theme-freedesktop` package. So substitute the full, FHS-compliant path with the path of the `sound-theme-freedesktop` package from the Nix store. --- pkgs/by-name/co/cosmic-osd/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 31be64525d5e..bef80f5a04bb 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + sound-theme-freedesktop, rustPlatform, libcosmicAppHook, pulseaudio, @@ -20,6 +21,11 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-ezOeRgqI/GOWFknUVZI7ZLEy1GYaBI+/An83HWKL6ho="; }; + postPatch = '' + substituteInPlace src/components/app.rs \ + --replace-fail '/usr/share/sounds/freedesktop/stereo/audio-volume-change.oga' '${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga' + ''; + useFetchCargoVendor = true; cargoHash = "sha256-vYehF2RjPrTZiuGcRUe4XX3ftRo7f+SIoKizD/kOtR8="; From 5bf7fe9dd333ea6e9220b92fdb12b03185279be2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 12:38:50 +0000 Subject: [PATCH 181/240] buildbox: 1.3.7 -> 1.3.11 --- pkgs/by-name/bu/buildbox/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/buildbox/package.nix b/pkgs/by-name/bu/buildbox/package.nix index eae793cf4599..40b5f2212c14 100644 --- a/pkgs/by-name/bu/buildbox/package.nix +++ b/pkgs/by-name/bu/buildbox/package.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "buildbox"; - version = "1.3.7"; + version = "1.3.11"; src = fetchFromGitLab { owner = "BuildGrid"; repo = "buildbox/buildbox"; tag = finalAttrs.version; - hash = "sha256-US0qJrKoAYR4rMmolC8jx7IpQ2PiHZy7L2bog+I3G48="; + hash = "sha256-lIRYwZLjYCpA4TMO3GF/yykVKn7LDyNHW9zItZmS9vM="; }; nativeBuildInputs = [ From e0b60c362b133fe316c678a26a58b1ac364fcf12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 12:39:57 +0000 Subject: [PATCH 182/240] openstackclient-full: 7.4.0 -> 8.0.0 --- .../python-modules/python-openstackclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 84b5c86f627a..1119f6e896fc 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -33,13 +33,13 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "7.4.0"; + version = "8.0.0"; pyproject = true; src = fetchPypi { pname = "python_openstackclient"; inherit version; - hash = "sha256-6BfhGgHLK1FvvZnc5FwJnI5BxD0RuxHmZycDqDhEnZ8="; + hash = "sha256-W3peBok/gztdKW0BnFDULHNo43dI7mvo6bFWVbmZQk4="; }; build-system = [ From 18f0ad0becaf019274b4ff33df70610ce753f51c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 13:27:51 +0000 Subject: [PATCH 183/240] surrealdb: 2.2.1 -> 2.2.2 --- pkgs/by-name/su/surrealdb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index e2b719de0761..45140d977307 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -13,17 +13,17 @@ }: rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; tag = "v${version}"; - hash = "sha256-MzVyzhZ9BNxavlyj3E1D9Mo2/o6Yue21FdhpT8ziXwE="; + hash = "sha256-NUmv/Ue14xrmBCxOkVXvcPmOwAA8L6LLPRu5E5Zkxw0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Uza2Ujg8EKGJrzitch71qIevgUv+n3YCtkMLHIAgPr4="; + cargoHash = "sha256-NkAove8RlLkNI1KnMfJPnoqUswJ22Z2FOcpl05lqpKM="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From 339fdb4502db92ac782e50b8d612d2310399b509 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Thu, 10 Apr 2025 16:00:00 +0200 Subject: [PATCH 184/240] claude-code: 0.2.65 -> 0.2.67 --- pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++---- pkgs/by-name/cl/claude-code/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index fa3dbcc79939..aa46c80620a7 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -5,13 +5,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^0.2.65" + "@anthropic-ai/claude-code": "^0.2.67" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "0.2.65", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.65.tgz", - "integrity": "sha512-LCxFb/WeHoHfVhQfEQGbGlFURYCm5Brcff4GHD+lVX2N3GtexLTcf0iXElAYz3S2vlWX9km8nGVfB/Yd/ieVUw==", + "version": "0.2.67", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.67.tgz", + "integrity": "sha512-z+9luCzhbmTzi/s550fMZCPbDOdc7sre4v0Ig72Svu+Ny+bNQ4TfGua5BP6E97hIummHq0DnYblkev8+RnCmlg==", "hasInstallScript": true, "license": "SEE LICENSE IN README.md", "bin": { diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index e6a2c8022be6..6100b6eef3e0 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "claude-code"; - version = "0.2.65"; + version = "0.2.67"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-4YFdDEpKi7agSqJUetcItqElec5VD0uQARwDSsh1S8o="; + hash = "sha256-Nbw6SCA2ZK1Viv9EvKB2/tHuR/OthZcZEBayqNKKUYE="; }; - npmDepsHash = "sha256-157BP/8DfEBE2dhOYj3CGzlV7M2EE44L0Zr0qwAQoQw="; + npmDepsHash = "sha256-oJ/lPzJ1dGcb7HMciSl8NXa4p+m4LbSapueDsSisyN8="; postPatch = '' cp ${./package-lock.json} package-lock.json From ae98b235c0bd4bcd9164ff44e4edeb9b18a772db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 14:03:59 +0000 Subject: [PATCH 185/240] jawiki-all-titles-in-ns0: 0-unstable-2025-03-01 -> 0-unstable-2025-04-01 --- pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix index ad02c7f3258c..d1035c5d46b7 100644 --- a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix +++ b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "jawiki-all-titles-in-ns0"; - version = "0-unstable-2025-03-01"; + version = "0-unstable-2025-04-01"; src = fetchFromGitHub { owner = "musjj"; repo = "jawiki-archive"; - rev = "e8e2b841c48b4475cc2ae99c4635ea140aa630d6"; - hash = "sha256-TJMOjayu9lWxg6j9HurXbxGc9RrCb/arXkVSezR2kgc="; + rev = "7c9ce3d1e3000a56222011566a9d8cb9b910416d"; + hash = "sha256-Yw/Iv7osjhL1kZwTOc2iiOJIf96GPcEDTCNO67gwbYU="; }; installPhase = '' From 187836140e502fe05485ee8b4da0d6adf739edd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 14:04:58 +0000 Subject: [PATCH 186/240] jp-zip-codes: 0-unstable-2025-03-01 -> 0-unstable-2025-04-01 --- pkgs/by-name/jp/jp-zip-codes/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jp/jp-zip-codes/package.nix b/pkgs/by-name/jp/jp-zip-codes/package.nix index c36c53af3f71..7c7a6ef175c4 100644 --- a/pkgs/by-name/jp/jp-zip-codes/package.nix +++ b/pkgs/by-name/jp/jp-zip-codes/package.nix @@ -7,15 +7,15 @@ stdenvNoCC.mkDerivation { pname = "jp-zip-code"; - version = "0-unstable-2025-03-01"; + version = "0-unstable-2025-04-01"; # This package uses a mirror as the source because the # original provider uses the same URL for updated content. src = fetchFromGitHub { owner = "musjj"; repo = "jp-zip-codes"; - rev = "82ea5a76dfaf43da8b838f20827ea535e37bd44c"; - hash = "sha256-DhQlbYgy+p1FZ2a/PxbauQ4UGR83Q64A2a3bn/yWD6Y="; + rev = "b8a350701688cfa61cb2994937cd84e612e0abf3"; + hash = "sha256-+YE0EINrhRhdqkJyPzXlBPp18TGECaGddVrBlQITYi8="; }; installPhase = '' From 8f16c0955ec3918f2b68ec9081633952e9155a5c Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 10 Apr 2025 16:16:58 +0200 Subject: [PATCH 187/240] chromium: make warnObsoleteVersionConditional conditional Prior to this, an obsolete version conditional would trigger an eval warning telling you that it can be safely removed now. In an attempt to make electron-source EOL removals a bit easier for the electron maintainers, mute those warnings by default. This way, electron maintainers can remove their EOL version on their own and aren't required to also touch the chromium derivation for cleanup. Chromium maintainers (or anyone, really) are able to opt-into those warnings by changing the value of enabled to true locally and act accordingly. Hope this clears a hurdle for the electron maintainers. --- pkgs/applications/networking/browsers/chromium/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index b31c31a7b829..d8c3cf2e3780 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -46,8 +46,10 @@ let min-version: result: let min-supported-version = (lib.head (lib.attrValues electron-source)).unwrapped.info.chromium.version; + # Warning can be toggled by changing the value of enabled: + enabled = false; in - lib.warnIf (lib.versionAtLeast min-supported-version min-version) + lib.warnIf (enabled && lib.versionAtLeast min-supported-version min-version) "chromium: min-supported-version ${min-supported-version} is newer than a conditional bounded at ${min-version}. You can safely delete it." result; chromiumVersionAtLeast = From 0f8763657980721d000f72631d3d91159d9da489 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 10 Apr 2025 15:56:51 +0200 Subject: [PATCH 188/240] python312Packages.mkdocs-drawio-file: init at 1.5.2 --- .../mkdocs-drawio-file/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/mkdocs-drawio-file/default.nix diff --git a/pkgs/development/python-modules/mkdocs-drawio-file/default.nix b/pkgs/development/python-modules/mkdocs-drawio-file/default.nix new file mode 100644 index 000000000000..5746e7601df3 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-drawio-file/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + beautifulsoup4, + jinja2, + lxml, + mkdocs, + requests, +}: + +buildPythonPackage rec { + pname = "mkdocs-drawio-file"; + version = "1.5.2"; + pyproject = true; + + src = fetchPypi { + pname = "mkdocs_drawio_file"; + inherit version; + hash = "sha256-5OPaG98m7ycxtEUyAYWunomHwq+r10VBnzza3kYtHhE="; + }; + + build-system = [ + poetry-core + ]; + + pythonRelaxDeps = [ + "lxml" + ]; + + dependencies = [ + beautifulsoup4 + jinja2 + lxml + mkdocs + requests + ]; + + pythonImportsCheck = [ + "mkdocs_drawio_file" + ]; + + # No tests available + doCheck = false; + + meta = { + description = "Embedding files of Diagrams.net (Draw.io) into MkDocs"; + homepage = "https://github.com/onixpro/mkdocs-drawio-file/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd9b64f66fbd..2b2af8277fcf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8789,6 +8789,8 @@ self: super: with self; { mkdocs-drawio-exporter = callPackage ../development/python-modules/mkdocs-drawio-exporter { }; + mkdocs-drawio-file = callPackage ../development/python-modules/mkdocs-drawio-file { }; + mkdocs-exclude = callPackage ../development/python-modules/mkdocs-exclude { }; mkdocs-get-deps = callPackage ../development/python-modules/mkdocs-get-deps { }; From 25672c5fd7ebe5706799030e1758fb18981f2973 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 10 Apr 2025 16:00:36 +0200 Subject: [PATCH 189/240] python312Packages.mkdocs-markmap: init at 2.5.2 --- .../python-modules/mkdocs-markmap/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/mkdocs-markmap/default.nix diff --git a/pkgs/development/python-modules/mkdocs-markmap/default.nix b/pkgs/development/python-modules/mkdocs-markmap/default.nix new file mode 100644 index 000000000000..115eb1767908 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-markmap/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + attrs, + beautifulsoup4, + mkdocs, + requests, +}: + +buildPythonPackage rec { + pname = "mkdocs-markmap"; + version = "2.5.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "markmap"; + repo = "mkdocs_markmap"; + tag = "v${version}"; + hash = "sha256-jC0MgN0CM8VmUR9NYVM5P6J+f8Qplg1DDal7i246slM="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + attrs + beautifulsoup4 + mkdocs + requests + ]; + + pythonImportsCheck = [ + "mkdocs_markmap" + ]; + + # No tests available + doCheck = false; + + meta = { + changelog = "https://github.com/markmap/mkdocs_markmap/releases/tag/v${version}"; + description = "MkDocs plugin and extension to create mindmaps from markdown using markmap"; + homepage = "https://github.com/markmap/mkdocs_markmap"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b2af8277fcf..401cb7e6d970 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8815,6 +8815,8 @@ self: super: with self; { mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { }; + mkdocs-markmap = callPackage ../development/python-modules/mkdocs-markmap { }; + mkdocs-material = callPackage ../development/python-modules/mkdocs-material { }; mkdocs-material-extensions = From dca49661f6c15f9ff9a0bce4053da49515f47a43 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 10 Apr 2025 16:33:49 +0200 Subject: [PATCH 190/240] python312Packages.libknot: 3.4.5 -> 3.4.6 --- pkgs/development/python-modules/libknot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index 3ae79aee2c7a..731319b7e44d 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.4.5"; + version = "3.4.6"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-z7OJiFQZ6m5y/qbZN9LLQ6NvKz3HQJXGGOE5gK0DTRM="; + hash = "sha256-GthzZgu8UW/BoW5AJSriKSKHEQF4w9S0Vnl9DKOsimk="; }; postPatch = '' From f6ec358124d939dcca2701c0d58f5d0fa90191f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 14:45:48 +0000 Subject: [PATCH 191/240] labwc-tweaks-gtk: 0-unstable-2025-03-07 -> 0-unstable-2025-04-01 --- pkgs/by-name/la/labwc-tweaks-gtk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix index 0a51e378b091..da3760f9e31a 100644 --- a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix +++ b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-tweaks-gtk"; - version = "0-unstable-2025-03-07"; + version = "0-unstable-2025-04-01"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-tweaks-gtk"; - rev = "24635c72d4da21df0b66fa23fb4a15686d257521"; - hash = "sha256-rDmY4+xUBv6Vw150X/3rP5bhW8Dmd8zEAyt86/c1+ss="; + rev = "b1779b293f1d0b07b328a6cbbfb5b1c4e3529d97"; + hash = "sha256-K2f1ztuhi3+btc41/1FYVvTBnPEVM5XQmlJxW7y9MlY="; }; nativeBuildInputs = [ From 706fc1209ab4981f74ad0441c12d99ce169137b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 15:05:49 +0000 Subject: [PATCH 192/240] python312Packages.fastembed: 0.6.0 -> 0.6.1 --- pkgs/development/python-modules/fastembed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastembed/default.nix b/pkgs/development/python-modules/fastembed/default.nix index 5e29d425cd92..93e3732113d2 100644 --- a/pkgs/development/python-modules/fastembed/default.nix +++ b/pkgs/development/python-modules/fastembed/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "fastembed"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; src = fetchFromGitHub { owner = "qdrant"; repo = "fastembed"; tag = "v${version}"; - hash = "sha256-mZClZuSTTGQQSH6KYLcVx0YaNoAwRO25eRxGGjOz8B8="; + hash = "sha256-/yg4yA/f2J2ku97xeMFPqVHgBUzlGJLVCF0fhu1rz8Q="; }; build-system = [ poetry-core ]; From 313f061c8a2d661d106eb684e454742f23c2fa10 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 10 Apr 2025 17:30:20 +0200 Subject: [PATCH 193/240] typstyle: 0.13.2 -> 0.13.3 Diff: https://github.com/Enter-tainer/typstyle/compare/refs/tags/v0.13.2...refs/tags/v0.13.3 Changelog: https://github.com/Enter-tainer/typstyle/blob/v0.13.3/CHANGELOG.md --- pkgs/by-name/ty/typstyle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index a41582f87d85..8eeaf3f2cd73 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "typstyle"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; tag = "v${finalAttrs.version}"; - hash = "sha256-kCBM2A2MihzB3tafn6+uHYjj85GAlAxMtheXAY+RksM="; + hash = "sha256-IcQphXFtyvJVWfcrJbumLUqgUpRCyRg0asziuDwDl84="; }; useFetchCargoVendor = true; - cargoHash = "sha256-K0N6Sq/YeM/Hi/BbJZMpQp+bEwttbJ/nVCWx5gxs1qQ="; + cargoHash = "sha256-hwUVhPkq6EVYiRmEV7DPzseO7Ip4tl7+h9A2efmlpEs="; # Disabling tests requiring network access checkFlags = [ From 5231d45b6abc4e0ac54f7812fc0c4cf9549c072c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 15:32:53 +0000 Subject: [PATCH 194/240] basedpyright: 1.28.4 -> 1.28.5 --- pkgs/by-name/ba/basedpyright/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 66e4927c255b..baf6ce4713c9 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -16,13 +16,13 @@ buildNpmPackage rec { pname = "basedpyright"; - version = "1.28.4"; + version = "1.28.5"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; tag = "v${version}"; - hash = "sha256-Ml8lb8E9sFRSOjaTv1R0OO5+gjXJk2GoL4Fkb+yvb0g="; + hash = "sha256-oaU+E/LAoZTeJjWnjvDDW2sXocNebWZ1HNrjHHgkGJ4="; }; npmDepsHash = "sha256-wzetOJxHJXK7oY1cwOG9YOrKKIDhFPD17em6UQ2859M="; From 24faeabfa31c574343ff4578bb93f166834d340c Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 10 Apr 2025 18:50:02 +0300 Subject: [PATCH 195/240] linux_6_14: 6.14.1 -> 6.14.2 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index a42b6ba6e4ba..aa76fb7418c1 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -32,7 +32,7 @@ "hash": "sha256:08kpzbysnabyjn76nk8f3zqxlsw45wkhw5vafrgr43vj3v1zrwjp" }, "6.14": { - "version": "6.14.1", - "hash": "sha256:01z4cf2aivg0bs1i874kqldwxsspg53wvkyfy2nlzmlzhz8j5wav" + "version": "6.14.2", + "hash": "sha256:06rfg9bnn48his9km0nf38i3fp4ylws7v9apjc9r0cgaajiq5in5" } } From f09feeca221c0d7eabb00b7dbcc989eafea61122 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 10 Apr 2025 18:50:10 +0300 Subject: [PATCH 196/240] linux_6_13: 6.13.10 -> 6.13.11 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index aa76fb7418c1..33b67037aa8a 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,8 +28,8 @@ "hash": "sha256:0dkk6d9ml44q2kr7wd8px8iy3lwgyb2qmbhq4f6sg1crnh580j5b" }, "6.13": { - "version": "6.13.10", - "hash": "sha256:08kpzbysnabyjn76nk8f3zqxlsw45wkhw5vafrgr43vj3v1zrwjp" + "version": "6.13.11", + "hash": "sha256:08gcms4gvh8i30wj9vk27rb7d4yrndprxk1m72dhr1f7lywz2azn" }, "6.14": { "version": "6.14.2", From d687118c32b09a0ff72dcd2f72c0181d3368a65e Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 10 Apr 2025 18:50:17 +0300 Subject: [PATCH 197/240] linux_6_12: 6.12.22 -> 6.12.23 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 33b67037aa8a..5e7b6a168b78 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:0s1yy429g70iry559hsfv3plf787bik3kkd0mpx3a1z44dsavqs9" }, "6.12": { - "version": "6.12.22", - "hash": "sha256:0dkk6d9ml44q2kr7wd8px8iy3lwgyb2qmbhq4f6sg1crnh580j5b" + "version": "6.12.23", + "hash": "sha256:0jbps9sr4bpg4ym6vjib33lfjqjh09azh39ck7v7zsyyz0259nfq" }, "6.13": { "version": "6.13.11", From 13f5437ebc883e6f705da278ca54d16f12ef949d Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 10 Apr 2025 18:50:23 +0300 Subject: [PATCH 198/240] linux_6_6: 6.6.86 -> 6.6.87 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5e7b6a168b78..9b325274bcd2 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:0vpgb3lmhgv5iw9b1z0kqr6vdv44if49marfp5858z3a8yj69bdk" }, "6.6": { - "version": "6.6.86", - "hash": "sha256:0s1yy429g70iry559hsfv3plf787bik3kkd0mpx3a1z44dsavqs9" + "version": "6.6.87", + "hash": "sha256:1iks6msk4cajyy0khyhrwsdl123hr81n67xzdnhlgg6dvb1famw9" }, "6.12": { "version": "6.12.23", From 0061b97a962a359af93804c33bec04b8b18c3040 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 10 Apr 2025 18:50:28 +0300 Subject: [PATCH 199/240] linux_6_1: 6.1.133 -> 6.1.134 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 9b325274bcd2..5cf8f6d87572 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:0kp35q86jihknj5y6f1zspfkhqx0c0npkk3is8p0gf2r3y302cp9" }, "6.1": { - "version": "6.1.133", - "hash": "sha256:0w5yb9y0jxrqh1wyajs33mpkcix4752acwra8jbg498r7yprzdcp" + "version": "6.1.134", + "hash": "sha256:08xx0w5gz7w5hqsnpckmizi1zpg38iwfchj20163ivnxf3fhriv0" }, "5.15": { "version": "5.15.179", From dba4236403e1eb9b49518e5c5a543c25ea7df090 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 10 Apr 2025 18:50:34 +0300 Subject: [PATCH 200/240] linux_5_15: 5.15.179 -> 5.15.180 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5cf8f6d87572..a94ee2e8ea21 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -8,8 +8,8 @@ "hash": "sha256:08xx0w5gz7w5hqsnpckmizi1zpg38iwfchj20163ivnxf3fhriv0" }, "5.15": { - "version": "5.15.179", - "hash": "sha256:0vqk4wd0cacigz42gigdzbj415hcdn2k2m01yr7k8pcv3rxs86ck" + "version": "5.15.180", + "hash": "sha256:0ffdy7zhp25z75n49j4rs8fs79icbmz1yy7k3xgcl2p6pfw6h7zm" }, "5.10": { "version": "5.10.235", From 109b3a01dbeeb78483b52937420385ecf8f2cf1f Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 10 Apr 2025 18:50:40 +0300 Subject: [PATCH 201/240] linux_5_10: 5.10.235 -> 5.10.236 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index a94ee2e8ea21..f6100199d255 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,8 +12,8 @@ "hash": "sha256:0ffdy7zhp25z75n49j4rs8fs79icbmz1yy7k3xgcl2p6pfw6h7zm" }, "5.10": { - "version": "5.10.235", - "hash": "sha256:1k7iq4np3pflkq3d71ya8xs5czhslhy2iha4ls9lma81269y6fwm" + "version": "5.10.236", + "hash": "sha256:12gv03hbddwm4nl8xxdvdr983nbh2lzrl4jr9p5kmv9rgn7wr9bd" }, "5.4": { "version": "5.4.291", From c083d009506441ae7b6440d2d508e5326af9e897 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 10 Apr 2025 18:50:44 +0300 Subject: [PATCH 202/240] linux_5_4: 5.4.291 -> 5.4.292 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index f6100199d255..5aee6d9bad4f 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -16,8 +16,8 @@ "hash": "sha256:12gv03hbddwm4nl8xxdvdr983nbh2lzrl4jr9p5kmv9rgn7wr9bd" }, "5.4": { - "version": "5.4.291", - "hash": "sha256:0vpgb3lmhgv5iw9b1z0kqr6vdv44if49marfp5858z3a8yj69bdk" + "version": "5.4.292", + "hash": "sha256:11dy6zvxnripwr4lfg357wdl70kcg5ljs3wxhz2klqpas60gbjqb" }, "6.6": { "version": "6.6.87", From 9015e447f21e40be108ef15842c79be75a02156c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 15:54:31 +0000 Subject: [PATCH 203/240] gitbutler: 0.14.14 -> 0.14.16 --- pkgs/by-name/gi/gitbutler/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index ba45fa023374..da4aafa6d9ee 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -35,13 +35,13 @@ in rustPlatform.buildRustPackage rec { pname = "gitbutler"; - version = "0.14.14"; + version = "0.14.16"; src = fetchFromGitHub { owner = "gitbutlerapp"; repo = "gitbutler"; tag = "release/${version}"; - hash = "sha256-GBQNk31rgNgAntur5DjmG4CKWvwvbpfaT2T6H7XMHQ0="; + hash = "sha256-SbxoLlXa6ZouZPY4P29ol9caDrM9XyJyBl35Wemmh9Y="; }; # Let Tauri know what version we're building @@ -60,11 +60,11 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-nKBCoKqq93fV3O4imX3sHYj5QnycIWDKvYyOB7Daeo8="; + cargoHash = "sha256-VlGHexsNOwipyKiotWYgt8E+x6C22a7xW2Zft39FeJE="; pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-ogCr2gzxox6UkFgaWTgZaEba5l++nzvuZa0NeRexnko="; + hash = "sha256-Zf/n49nb1PcE3RMeBoN3EAershxQh1AO8Hx9m3NV9XM="; }; nativeBuildInputs = [ From 5ed6b8e022f560b68f0d5503c42d48eb2f1469d7 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 10 Apr 2025 18:54:34 +0300 Subject: [PATCH 204/240] linux-firmware: 20250311 -> 20250410 --- pkgs/by-name/li/linux-firmware/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix index dcdad53cb207..31f2c712ed95 100644 --- a/pkgs/by-name/li/linux-firmware/package.nix +++ b/pkgs/by-name/li/linux-firmware/package.nix @@ -22,11 +22,11 @@ let in stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20250311"; + version = "20250410"; src = fetchzip { url = "https://cdn.kernel.org/pub/linux/kernel/firmware/linux-firmware-${version}.tar.xz "; - hash = "sha256-ZM7j+kUpmWJUQdAGbsfwOqsNV8oE0U2t6qnw0b7pT4g="; + hash = "sha256-aQdEl9+7zbNqWSII9hjRuPePvSfWVql5u5TIrGsa+Ao="; }; postUnpack = '' From 6de9039315c8798f9d56f0045cb454767775138b Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sun, 30 Mar 2025 23:11:03 +0900 Subject: [PATCH 205/240] lib/modules: add `class` to `specialArgs` Co-Authored-By: Johannes Kirschbauer --- lib/modules.nix | 1 + lib/tests/modules.sh | 12 +++++ .../modules/assert-module-class-is-nixos.nix | 3 ++ lib/tests/modules/class-check.nix | 5 +- lib/tests/modules/expose-module-class.nix | 8 +++ lib/tests/modules/polymorphic-module.nix | 23 ++++++++ lib/tests/modules/specialArgs-class.nix | 54 +++++++++++++++++++ 7 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 lib/tests/modules/assert-module-class-is-nixos.nix create mode 100644 lib/tests/modules/expose-module-class.nix create mode 100644 lib/tests/modules/polymorphic-module.nix create mode 100644 lib/tests/modules/specialArgs-class.nix diff --git a/lib/modules.nix b/lib/modules.nix index 7716e855ebb2..290b9ce0b698 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -257,6 +257,7 @@ let config specialArgs ; + _class = class; } // specialArgs ); diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 9df6e61797b7..d0f25c283dcb 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -681,6 +681,18 @@ checkConfigOutput '^true$' config.viaConfig ./mkDefinition.nix checkConfigOutput '^true$' config.mkMerge ./mkDefinition.nix checkConfigOutput '^true$' config.mkForce ./mkDefinition.nix +# specialArgs._class +checkConfigOutput '"nixos"' config.nixos.config.foo ./specialArgs-class.nix +checkConfigOutput '"bar"' config.conditionalImportAsNixos.config.foo ./specialArgs-class.nix +checkConfigError 'attribute .*bar.* not found' config.conditionalImportAsNixos.config.bar ./specialArgs-class.nix +checkConfigError 'attribute .*foo.* not found' config.conditionalImportAsDarwin.config.foo ./specialArgs-class.nix +checkConfigOutput '"foo"' config.conditionalImportAsDarwin.config.bar ./specialArgs-class.nix +checkConfigOutput '"nixos"' config.sub.nixos.foo ./specialArgs-class.nix +checkConfigOutput '"bar"' config.sub.conditionalImportAsNixos.foo ./specialArgs-class.nix +checkConfigError 'attribute .*bar.* not found' config.sub.conditionalImportAsNixos.bar ./specialArgs-class.nix +checkConfigError 'attribute .*foo.* not found' config.sub.conditionalImportAsDarwin.foo ./specialArgs-class.nix +checkConfigOutput '"foo"' config.sub.conditionalImportAsDarwin.bar ./specialArgs-class.nix + cat < Date: Thu, 10 Apr 2025 16:04:50 +0000 Subject: [PATCH 206/240] discordo: 0-unstable-2025-03-31 -> 0-unstable-2025-04-05 --- pkgs/applications/networking/discordo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index 1d530dfbdb20..ec4705660e91 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "discordo"; - version = "0-unstable-2025-03-31"; + version = "0-unstable-2025-04-05"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "9e95b18ab7ba021a71f94e7520c1b9e3b73d3c0f"; - hash = "sha256-XxjhLVs87npwuys5FmfMba6dg4NcgRPIieTDgI6UXyk="; + rev = "977e9c99b2c8aea2210e73541955515883931f03"; + hash = "sha256-WFGyXfi3P0xr9bLqhBgtfAjc8fQRrmwSbvlFLPHRi5Q="; }; vendorHash = "sha256-NKGsY/5FqLGbwyW6fVSxictDVhju0+jOJSBXQp3ZhFY="; From 83e7f371260b9c51bb347301164290b40b2da023 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 16:08:27 +0000 Subject: [PATCH 207/240] terraform-providers.spotinst: 1.216.0 -> 1.216.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 85aa22a24bc4..b7ebb6b8da4a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1228,11 +1228,11 @@ "vendorHash": "sha256-oEamCseBGmETqeBLiBHfh81oQNUHWfTrsegkFijvb20=" }, "spotinst": { - "hash": "sha256-tTU9+4wxSMSWmmeuSpS60FSuzg9BH6ylEaywLB9LwQc=", + "hash": "sha256-8BP8ltL2fWbTxRCdiypPzKvWpbUfLG6mRTAx3onujHY=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.216.0", + "rev": "v1.216.1", "spdx": "MPL-2.0", "vendorHash": "sha256-STIPYBMj6r630/J71fAeLTkrvop/8u7gToGcijopqCo=" }, From 7fa37636834199172eaa342959b14ad8fd57e813 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Thu, 10 Apr 2025 19:11:41 +0300 Subject: [PATCH 208/240] rxvt-unicode: set `meta.mainProgram` to "urxvt" --- pkgs/applications/terminal-emulators/rxvt-unicode/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index e380fe052d26..ee3b038e7970 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -164,5 +164,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.unix; license = licenses.gpl3; + mainProgram = "urxvt"; }; } From 4f598633a8d92ca8733b102a8253d7ab7a3174f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 16:12:05 +0000 Subject: [PATCH 209/240] python312Packages.clarifai-grpc: 11.2.6 -> 11.3.1 --- pkgs/development/python-modules/clarifai-grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index d24cf78f2dcb..5dde12bd7e0a 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "11.2.6"; + version = "11.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; tag = version; - hash = "sha256-U3hYAwNklPRKD/mHmuc2pgWEKQgU5SZmfMJwCU6CXmA="; + hash = "sha256-6eEW0s9eC36BqGvtMuF6thzSUqQWI3WP3vP2FssnHVU="; }; build-system = [ setuptools ]; From a79700995918e2f2a2aa5b1207a86f907f082b1f Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 10 Apr 2025 19:14:05 +0300 Subject: [PATCH 210/240] kdePackages.kwin: backport crash fix recommended by upstream --- pkgs/kde/plasma/kwin/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix index 0d78ac721cf2..6b8bd06d5a0e 100644 --- a/pkgs/kde/plasma/kwin/default.nix +++ b/pkgs/kde/plasma/kwin/default.nix @@ -17,6 +17,7 @@ pipewire, krunner, python3, + fetchpatch, }: mkKdeDerivation { pname = "kwin"; @@ -29,6 +30,13 @@ mkKdeDerivation { ./0003-plugins-qpa-allow-using-nixos-wrapper.patch ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch ./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch + + # Backport crash fix + # FIXME: remove in 6.3.5 + (fetchpatch { + url = "https://invent.kde.org/plasma/kwin/-/commit/93bf2f98ae22e654d997c7140b7fe9936fa3f2d3.patch"; + hash = "sha256-Jaa7IVuYMfxzUv0y2rUo5hdYavjaUkEW9/yteL5katE="; + }) ]; postPatch = '' From 420f521ddea27971c8b29599d151914556a27dbb Mon Sep 17 00:00:00 2001 From: goodylove Date: Wed, 9 Apr 2025 19:44:41 +0100 Subject: [PATCH 211/240] icestudio: 0-unstable-2024-11-18 -> 0.12-unstable-2025-03-08 --- pkgs/by-name/ic/icestudio/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ic/icestudio/package.nix b/pkgs/by-name/ic/icestudio/package.nix index 37255829871d..964fed7e080b 100644 --- a/pkgs/by-name/ic/icestudio/package.nix +++ b/pkgs/by-name/ic/icestudio/package.nix @@ -5,6 +5,7 @@ buildNpmPackage, makeDesktopItem, makeWrapper, + unstableGitUpdater, nwjs, python3, @@ -12,13 +13,13 @@ let # Use unstable because it has improvements for finding python - version = "0-unstable-2024-11-18"; + version = "0.12-unstable-2025-03-08"; src = fetchFromGitHub { owner = "FPGAwars"; repo = "icestudio"; - rev = "87d057adb1e795352a7dd67666a69ada4269b2e8"; - hash = "sha256-VZuc5Wa6o5PMUE+P4EMDl/pI/zmcff9OEhqeCfS4bzE="; + rev = "46d39da2613aa2f55a068b50e7ac45a8f270005d"; + hash = "sha256-UNRNJubM9ePjXhqZ9RiZQIxGBMM3nOye83S7J8wCHMg="; }; collection = fetchurl { @@ -29,7 +30,7 @@ let app = buildNpmPackage { pname = "icestudio-app"; inherit version src; - npmDepsHash = "sha256-CbrnhnhCG8AdAqySO6fB5hZ128lHyC3WH/vZcFtv6Ko="; + npmDepsHash = "sha256-Dpnx23iq0fK191DXFgIfnbi+MLEp65H6eL81Icg4H4U="; sourceRoot = "${src.name}/app"; dontNpmBuild = true; installPhase = '' @@ -50,7 +51,7 @@ in buildNpmPackage rec { pname = "icestudio"; inherit version src; - npmDepsHash = "sha256-y1lo5+qJ6JBxjt7wtUmTHuJHMH9Mztf6xmmadI8zBgA="; + npmDepsHash = "sha256-ZHvXC0hpAcPMsHhxQWELFC2b+WBNoEvbtLLNJsDhMso="; npmFlags = [ # Use the legacy dependency resolution, with less strict version # requirements for transative dependencies @@ -101,6 +102,7 @@ buildNpmPackage rec { runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { }; nativeBuildInputs = [ makeWrapper ]; From 518badbf272fc77c28ae152223f9c779b2b47a71 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 10 Apr 2025 18:16:04 +0200 Subject: [PATCH 212/240] openvino: 2025.0.0 -> 2025.1.0 https://github.com/openvinotoolkit/openvino/releases/tag/2025.1.0 --- pkgs/by-name/op/openvino/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index dc5b3036b560..56c51de76b72 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -61,14 +61,14 @@ in stdenv.mkDerivation rec { pname = "openvino"; - version = "2025.0.0"; + version = "2025.1.0"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; tag = version; fetchSubmodules = true; - hash = "sha256-+LXOX5ChfVbD2dbQYuIp9unz6v3OIpH5YUpdhn2okbM="; + hash = "sha256-KufQjBSzhj1N+T95PjlNU3Tc9V5/X2OLwCbXoI2fdZk="; }; outputs = [ From 6a45d840c86c9a31dcb301668a8d8efe0688e4f8 Mon Sep 17 00:00:00 2001 From: Patrick Poitras <42386710+Patrick-Poitras@users.noreply.github.com> Date: Thu, 10 Apr 2025 09:21:26 -0700 Subject: [PATCH 213/240] ocamlPackages.merlin: add meta.mainProgram (#397595) Co-authored-by: Arne Keller --- pkgs/development/tools/ocaml/merlin/4.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 660fe6671625..a7673d2427ff 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -95,6 +95,7 @@ buildDunePackage { description = "Editor-independent tool to ease the development of programs in OCaml"; homepage = "https://github.com/ocaml/merlin"; license = licenses.mit; + mainProgram = "ocamlmerlin"; maintainers = [ maintainers.vbgl maintainers.sternenseemann From 650086ac6df999f3454d77b655e4489eccbe5c5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 12:50:17 +0000 Subject: [PATCH 214/240] faircamp: 1.2.0 -> 1.3.0 --- pkgs/by-name/fa/faircamp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fa/faircamp/package.nix b/pkgs/by-name/fa/faircamp/package.nix index b8217680fd93..bbb53aabcecf 100644 --- a/pkgs/by-name/fa/faircamp/package.nix +++ b/pkgs/by-name/fa/faircamp/package.nix @@ -17,19 +17,19 @@ rustPlatform.buildRustPackage rec { pname = "faircamp"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "simonrepp"; repo = "faircamp"; rev = version; - hash = "sha256-InBPQk8dIwsCfvo24/0ggK/tipHaC0owPbZtrrIT/FY="; + hash = "sha256-zKwKuGN+8HT1rSbweQGvpkvMtF2WAB8EEV9pGeKtdlw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-f+RFjBiChLAEk0Azh2wqXmOlDNl3221MYUVVbCisg0c="; + cargoHash = "sha256-5suzKkdGHxPuJWWvu17Dph+zli/1yIDB0GcAemmahtI="; buildFeatures = [ "libvips" ]; From fa9fbf0b22a79bf91b1c51865f3693e33cfa6b57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 16:37:27 +0000 Subject: [PATCH 215/240] ginkgo: 2.23.3 -> 2.23.4 --- pkgs/by-name/gi/ginkgo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix index 0e852265f0db..4d9107f2a17c 100644 --- a/pkgs/by-name/gi/ginkgo/package.nix +++ b/pkgs/by-name/gi/ginkgo/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.23.3"; + version = "2.23.4"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-lDSw4BPYZ5wOuaoUtSSkdbcOpKAEuLsSwldrASpM6mA="; + sha256 = "sha256-bTgZHO9dArqYKCqruQPzpiLFtzK9RzxOonwl0SmoNQc="; }; - vendorHash = "sha256-uqpib3k5PtQOsndic0GV1rYBeVlY5Tpg931yHfU6dWI="; + vendorHash = "sha256-iwKOgeUbzlfrto5t0utEdKb+PVqcpmViuDhK2PBAzHw="; # integration tests expect more file changes # types tests are missing CodeLocation From a8e3f39bbdc9fe61e6a9b5d6f9df5fa87cc39c07 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 10 Apr 2025 14:44:39 +0000 Subject: [PATCH 216/240] television: 0.11.5 -> 0.11.6 Diff: https://github.com/alexpasmantier/television/compare/0.11.5...0.11.6 Changelog: https://github.com/alexpasmantier/television/releases/tag/0.11.6 --- pkgs/by-name/te/television/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index c2b2c251236d..1e09eb1502f0 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -8,17 +8,17 @@ }: rustPlatform.buildRustPackage rec { pname = "television"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; tag = version; - hash = "sha256-2Yt98ZtoTHqCtyqGuPL583NBe2CHI+9PIyO0fnonM4E="; + hash = "sha256-wfIzmk4mCSdfSAJP2DcnpuQAg62m6CfynmxoH580k9A="; }; useFetchCargoVendor = true; - cargoHash = "sha256-+T/WC7jq6qra9qxQ+mR929LQavETHTtAGHKWm81cwNU="; + cargoHash = "sha256-C/umcbD/wb+Bz9Qbp7gx70Cr5blcXgEqsIfLKefZrrY="; passthru = { tests.version = testers.testVersion { From ffe6651ecebfd667b69fe69043a653d36536d5d7 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 10 Apr 2025 18:53:22 +0200 Subject: [PATCH 217/240] Revert "ci: Update pinned Nixpkgs" --- ci/pinned-nixpkgs.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/pinned-nixpkgs.json b/ci/pinned-nixpkgs.json index 00cd71fab0ab..c5c558dc61bc 100644 --- a/ci/pinned-nixpkgs.json +++ b/ci/pinned-nixpkgs.json @@ -1,4 +1,4 @@ { - "rev": "b2b0718004cc9a5bca610326de0a82e6ea75920b", - "sha256": "0aqrxx1w40aqicjhg2057bpyrrbsx6mnii5dp5klpm4labfg2iwi" + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", + "sha256": "0qg99zj0gb0pc6sjlkmwhk1c1xz14qxmk6gamgfmcxpsfdp5vn72" } From a388675f07477f07e58d36ca23e54e3c7995dd36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 17:03:16 +0000 Subject: [PATCH 218/240] pip-audit: 2.8.0 -> 2.9.0 --- pkgs/by-name/pi/pip-audit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pip-audit/package.nix b/pkgs/by-name/pi/pip-audit/package.nix index 10a402a621a9..721a9a8fd921 100644 --- a/pkgs/by-name/pi/pip-audit/package.nix +++ b/pkgs/by-name/pi/pip-audit/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; - version = "2.8.0"; + version = "2.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = "pip-audit"; tag = "v${version}"; - hash = "sha256-UW7pJYMcc8Myc4DmrZqAPUhAVs9J6o8/6QQb5vxskcg="; + hash = "sha256-j8ZKqE7PEwaCTUNnJunqM0A2eyuWfx8zG5i3nmZERow="; }; build-system = with python3.pkgs; [ flit-core ]; @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool for scanning Python environments for known vulnerabilities"; homepage = "https://github.com/trailofbits/pip-audit"; - changelog = "https://github.com/pypa/pip-audit/releases/tag/v${version}"; + changelog = "https://github.com/pypa/pip-audit/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "pip-audit"; From f00b7c05079a06037aaa665baa26c6b983f4095c Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Thu, 10 Apr 2025 20:04:19 +0300 Subject: [PATCH 219/240] =?UTF-8?q?sile:=200.15.10=20=E2=86=92=200.15.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/si/sile/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix index 750f31fe0c4d..d269c197e96d 100644 --- a/pkgs/by-name/si/sile/package.nix +++ b/pkgs/by-name/si/sile/package.nix @@ -29,18 +29,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "sile"; - version = "0.15.10"; + version = "0.15.11"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.tar.zst"; - hash = "sha256-sPABtKfIpamGNWELnCnkVagHeuHq/1KoT364/aLHDu0="; + hash = "sha256-J+S2jT8/1bX35E3FyLLvPnSGY4hT2P7Uqu59L95cI0I="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; dontConfigure = true; nativeBuildInputs = [ zstd ]; - hash = "sha256-57NcGm46aggPO+/54P1arCSPV3BHlAWwmWIzbpkT2js="; + hash = "sha256-4hw2A9GYqNeNjEZRL7THKMoEBBmTnjKE00yQYLTW6zc="; }; nativeBuildInputs = [ From 446feb2c0c04dc7f69c6d092ccd4c66a0eda3813 Mon Sep 17 00:00:00 2001 From: "Matthieu C." <886074+teto@users.noreply.github.com> Date: Tue, 4 Mar 2025 00:57:24 +0100 Subject: [PATCH 220/240] luaPackages.grug-far-nvim: init at 20250304 I've added the tests because I like the ability to check the behavior of the plugin when run in the sandbox without my crazy config. It also helps documenting how to check the plugin when running updates. --- maintainers/scripts/luarocks-packages.csv | 1 + .../editors/vim/plugins/generated.nix | 13 -------- .../editors/vim/plugins/luaPackagePlugins.nix | 1 + .../editors/vim/plugins/vim-plugin-names | 1 - .../lua-modules/generated-packages.nix | 30 +++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 21 +++++++++++++ 6 files changed, 53 insertions(+), 14 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 5beef16bf14b..72f1fb1f9a44 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -26,6 +26,7 @@ funnyfiles.nvim,,,,,,mrcjkb fzf-lua,,,,,,mrcjkb fzy,,,,,,mrcjkb gitsigns.nvim,https://raw.githubusercontent.com/lewis6991/gitsigns.nvim/main/gitsigns.nvim-scm-1.rockspec,,,,5.1, +grug-far.nvim,,,,,,teto haskell-tools.nvim,,,,,,mrcjkb http,,,,0.3-0,,vcunat image.nvim,,,,,,teto diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 51acb273de41..358a337c882f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5438,19 +5438,6 @@ final: prev: { meta.hydraPlatforms = [ ]; }; - grug-far-nvim = buildVimPlugin { - pname = "grug-far.nvim"; - version = "2025-04-08"; - src = fetchFromGitHub { - owner = "MagicDuck"; - repo = "grug-far.nvim"; - rev = "082f97122dd59d816a9a7b676d2b2f86a8ab6ed9"; - sha256 = "04z8d5vh4z26d3rpf8ab78q434zsvg6h1fb7hhkd3mqk8wlv0zyw"; - }; - meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; - meta.hydraPlatforms = [ ]; - }; - gruvbox = buildVimPlugin { pname = "gruvbox"; version = "2023-08-14"; diff --git a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix index b130c56caa88..8a94cc10b390 100644 --- a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix @@ -10,6 +10,7 @@ let luarocksPackageNames = [ "fidget-nvim" "gitsigns-nvim" + "grug-far-nvim" "image-nvim" "lsp-progress-nvim" "lualine-nvim" diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 152d070b88a5..18059181e5d7 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -416,7 +416,6 @@ https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD, https://github.com/liuchengxu/graphviz.vim/,, https://github.com/cbochs/grapple.nvim/,HEAD, https://github.com/blazkowolf/gruber-darker.nvim/,, -https://github.com/MagicDuck/grug-far.nvim/,, https://github.com/morhetz/gruvbox/,, https://github.com/luisiacc/gruvbox-baby/,HEAD, https://github.com/gruvbox-community/gruvbox/,,gruvbox-community diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 2218b5e0f82f..eb9923609bdd 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -926,6 +926,36 @@ final: prev: { } ) { }; + grug-far-nvim = callPackage ( + { + buildLuarocksPackage, + fetchurl, + fetchzip, + luaOlder, + }: + buildLuarocksPackage { + pname = "grug-far.nvim"; + version = "1.5.15-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/grug-far.nvim-1.5.15-1.rockspec"; + sha256 = "1jp6b6kqp389wli766rypam4hr6dqv6v5r8kv1dk21d7glz8hg6h"; + }).outPath; + src = fetchzip { + url = "https://github.com/MagicDuck/grug-far.nvim/archive/5da116bc99a03e14be3b824e319f4e49c676af78.zip"; + sha256 = "196l6vy9573fkwld3cl927706a6gfgmc71kn1kx3pmk8l6p8hcya"; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/MagicDuck/grug-far.nvim"; + description = "Find And Replace plugin for neovim"; + license.fullName = "MIT"; + }; + } + ) { }; + http = callPackage ( { basexx, diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 5bf89a654b84..54c87b8ea563 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -212,6 +212,27 @@ in ''; }); + grug-far-nvim = prev.grug-far-nvim.overrideAttrs ({ + doCheck = lua.luaversion == "5.1" && !stdenv.hostPlatform.isDarwin; + nativeCheckInputs = [ + final.busted + final.mini-test + final.nlua + ripgrep + neovim-unwrapped + ]; + + # feel free to disable the checks. They are mostly screenshot based + checkPhase = '' + runHook preCheck + # feel free to disable/adjust the tests + rm tests/base/test_apply.lua tests/base/test_vimscript_interpreter.lua + make test dir=base + runHook postCheck + ''; + + }); + http = prev.http.overrideAttrs (oa: { patches = [ (fetchpatch { From 0eeb9d8fbbe38ad24a90f6b8fd0e3f8b73beccbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 17:15:05 +0000 Subject: [PATCH 221/240] grafana-alloy: 1.7.5 -> 1.8.1 --- pkgs/by-name/gr/grafana-alloy/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix index 4e9b416979d9..653494758c6b 100644 --- a/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/pkgs/by-name/gr/grafana-alloy/package.nix @@ -17,17 +17,17 @@ buildGoModule rec { pname = "grafana-alloy"; - version = "1.7.5"; + version = "1.8.1"; src = fetchFromGitHub { owner = "grafana"; repo = "alloy"; tag = "v${version}"; - hash = "sha256-4JfzjeF654+Q4Hc/0P08minpSJX3mO/p8EOeHUCKu6A="; + hash = "sha256-QuKwsKIm42hcWgLq2etjvBf+NDGiMVPQkKdQJZrFxUg="; }; proxyVendor = true; - vendorHash = "sha256-rZcqCcb++A8HYLVcGVWQ61fEXAqF0GXbTze/GGsF5bA="; + vendorHash = "sha256-Vqhdc+WZC8IACEzox5c4PsOvYwQ2WFL3lDM+hB1foE0="; nativeBuildInputs = [ fixup-yarn-lock @@ -70,7 +70,7 @@ buildGoModule rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/internal/web/ui/yarn.lock"; - hash = "sha256-4vZr3mPvk5IXoqSPuqhzYobAuK2NDK0dceNZUIQILvI="; + hash = "sha256-gKCjJe3TVpaHm/gwaNh4zeL5k4jlbWfF94aDYQ1brU8="; }; preBuild = '' From fe89b307004925a5531a5c97e3ebb4d865a5007a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 10 Apr 2025 19:10:42 +0200 Subject: [PATCH 222/240] mujoco: 3.3.0 -> 3.3.1 Diff: https://github.com/google-deepmind/mujoco/compare/refs/tags/3.3.0...refs/tags/3.3.1 Changelog: https://mujoco.readthedocs.io/en/3.3.1/changelog.html --- pkgs/by-name/mu/mujoco/package.nix | 12 ++++++------ pkgs/development/python-modules/mujoco/default.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix index 50bf731bdeae..1c113ce99bf3 100644 --- a/pkgs/by-name/mu/mujoco/package.nix +++ b/pkgs/by-name/mu/mujoco/package.nix @@ -18,8 +18,8 @@ let abseil-cpp = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = "9ac7062b1860d895fb5a8cbf58c3e9ef8f674b5f"; - hash = "sha256-uOgUtF8gaEgcxFK9WAoAhv4GoS8P23IoUxHZZVZdpPk="; + rev = "d9e4955c65cd4367dd6bf46f4ccb8cd3d100540b"; + hash = "sha256-QTywqQCkyGFpdbtDBvUwz9bGXxbJs/qoFKF6zYAZUmQ="; }; benchmark = fetchFromGitHub { owner = "google"; @@ -36,8 +36,8 @@ let eigen3 = fetchFromGitLab { owner = "libeigen"; repo = "eigen"; - rev = "66f7f51b7e069d0a03a21157fa60b24aece69aeb"; - hash = "sha256-/xd0GnXoW8vclIk8aKAziQwDx6AdlBmZD48p8aCX6TQ="; + rev = "464c1d097891a1462ab28bf8bb763c1683883892"; + hash = "sha256-OJyfUyiR8PFSaWltx6Ig0RCB+LxPxrPtc0GUfu2dKrk="; }; googletest = fetchFromGitHub { owner = "google"; @@ -132,7 +132,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mujoco"; - version = "3.3.0"; + version = "3.3.1"; # Bumping version? Make sure to look though the MuJoCo's commit # history for bumped dependency pins! @@ -140,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "google-deepmind"; repo = "mujoco"; tag = finalAttrs.version; - hash = "sha256-6Mb50WD5ZQksKoG4FH3+iyy9qBqa1fKUPyt6McNDkGg="; + hash = "sha256-1bCB+z3Puo+AmdwEYy8v5+TJGBVk5xrN9rz+9I3h+r8="; }; patches = [ ./mujoco-system-deps-dont-fetch.patch ]; diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix index 40140ba110b4..6da5bd24f146 100644 --- a/pkgs/development/python-modules/mujoco/default.nix +++ b/pkgs/development/python-modules/mujoco/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { # in the project's CI. src = fetchPypi { inherit pname version; - hash = "sha256-D7EqtxW8K20jlKYzC4w6HdlbDzuoEr/k9skeChyjrQ8="; + hash = "sha256-UhSjXBVngiwMi4DoZX6+KHJry5Tni9Uyg/+RfS2IECg="; }; nativeBuildInputs = [ cmake ]; From de15fa9797ba20123714ef529b2306ff573e2e6e Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Fri, 11 Apr 2025 01:44:19 +0800 Subject: [PATCH 223/240] emacs: fix GitLab API usage when generating MELPA packages The wrong API fetches a tarball from master instead of the specified commit, leading to a wrong hash[1]. API: https://docs.gitlab.com/api/repositories/#get-file-archive [1]: https://github.com/nix-community/emacs-overlay/pulls?q=is%3Apr+author%3Ajian-lin+is%3Aclosed+in%3Atitle+hash+ --- pkgs/applications/editors/emacs/elisp-packages/update-melpa.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el b/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el index 9cb6456cd6f9..97343135ef0e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el +++ b/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el @@ -101,7 +101,7 @@ return Promise to resolve in that process." ("gitlab" (list "nix-prefetch-url" "--unpack" (concat "https://gitlab.com/api/v4/projects/" (url-hexify-string repo) - "/repository/archive.tar.gz?ref=" + "/repository/archive.tar.gz?sha=" commit))) ("sourcehut" (list "nix-prefetch-url" "--unpack" (concat "https://git.sr.ht/~" repo "/archive/" commit ".tar.gz"))) From c696be4e1e6541591d252edcc30d15835d865582 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 18:03:36 +0000 Subject: [PATCH 224/240] mackerel-agent: 0.84.2 -> 0.84.3 --- pkgs/by-name/ma/mackerel-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mackerel-agent/package.nix b/pkgs/by-name/ma/mackerel-agent/package.nix index f8579fb30f36..03dfc2b2385e 100644 --- a/pkgs/by-name/ma/mackerel-agent/package.nix +++ b/pkgs/by-name/ma/mackerel-agent/package.nix @@ -10,20 +10,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.84.2"; + version = "0.84.3"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sh5hbhWlyu70Wm2zTQeKiQr/nYi6bG4g6a/yvEnd/DU="; + sha256 = "sha256-933ZcpqfiB/6RW6Kv/PDPATITlX8p6xC+vu8MfZUdgY="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ iproute2 ]; - vendorHash = "sha256-2JpI67HkhNJcFTuveHSgsqmmHhWOjHC0f0dK0tOjwIc="; + vendorHash = "sha256-Q3HsfLA6xqzwXVfRc0bOb15kW2tdwj14DvJEZoRy0/4="; subPackages = [ "." ]; From 8b331e61a9a2acb20a4da7179de9593407b9a513 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 23:19:46 +0000 Subject: [PATCH 225/240] jenkins: 2.492.2 -> 2.492.3 --- pkgs/by-name/je/jenkins/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index e76fe43fea9c..f53773dc176b 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.492.2"; + version = "2.492.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-rmD71fB8pM1COkc37XHztU7PFGZruYoMv/anc1QMInU="; + hash = "sha256-kMz1VhM8Nv33ZTrXEPANJIvyiV+fvCbM7g4tO6aBsB8="; }; nativeBuildInputs = [ makeWrapper ]; From a5313f3a84c715641b9f667604f554a61132624e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 18:35:56 +0000 Subject: [PATCH 226/240] terraform-providers.sumologic: 3.0.7 -> 3.0.8 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 85aa22a24bc4..8fd0e8f3f58b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1264,13 +1264,13 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-x7TN3UrvW3/0MnvmJEQp9z/2qUe2yX21hk0V9/nZUF0=", + "hash": "sha256-15ZM0Uk0VEEPTC/paxUq4dTG/myV1yyJX8wJW/BuH/0=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v3.0.7", + "rev": "v3.0.8", "spdx": "MPL-2.0", - "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" + "vendorHash": "sha256-S3SBp17+qqA64tWydD5DYc9KahycJ+qDrdXvFwu6Lbc=" }, "sysdig": { "hash": "sha256-9oj8rk4ltVcg5yPWU0WFxG1GvG3w9NM2MKi/UKM1U00=", From 56dde4feef76965f14d8dc70e9e2fd21984d4880 Mon Sep 17 00:00:00 2001 From: Alex Epelde Date: Thu, 10 Apr 2025 13:31:11 -0400 Subject: [PATCH 227/240] altus: correct icon filename The upstream `Altus.desktop` file contains the line `Icon=Altus`. So the application icon should be installed to `.../Altus.png`. --- pkgs/by-name/al/altus/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/al/altus/package.nix b/pkgs/by-name/al/altus/package.nix index 0312e2001eb3..f45196542f99 100644 --- a/pkgs/by-name/al/altus/package.nix +++ b/pkgs/by-name/al/altus/package.nix @@ -25,10 +25,9 @@ appimageTools.wrapType2 { nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = '' - install -m 444 -D ${appimageContents}/Altus.desktop $out/share/applications/altus.desktop - install -m 444 -D ${appimageContents}/Altus.png \ - $out/share/icons/hicolor/scalable/apps/altus.png - substituteInPlace $out/share/applications/altus.desktop \ + install -Dm 644 ${appimageContents}/Altus.desktop -t $out/share/applications + install -Dm 644 ${appimageContents}/Altus.png -t $out/share/icons/hicolor/256x256/apps + substituteInPlace $out/share/applications/Altus.desktop \ --replace-fail 'Exec=AppRun' 'Exec=altus' wrapProgram "$out/bin/altus" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" From 25bcf6f1324ed28c4a8b483db4772757a2dd856e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 18:44:24 +0000 Subject: [PATCH 228/240] python312Packages.garth: 0.5.3 -> 0.5.4 --- pkgs/development/python-modules/garth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index 92fdef89b655..b7c53ca4b108 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "garth"; - version = "0.5.3"; + version = "0.5.4"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-cyqXCkfkpd71VqguZFOA4bO/dOkKBZkEzJ6BVLCBWFA="; + hash = "sha256-Uv8kdEBPCO0W50zPzdFAgot6H/FURbhR8f1rWjGTJ9I="; }; pythonRelaxDeps = [ "requests-oauthlib" ]; From ce9edd60e3fb4c04e5b921ecdbeacecc64ac0ada Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Thu, 10 Apr 2025 19:40:17 +0530 Subject: [PATCH 229/240] cosmic-settings-daemon: substitute generic "Pop theme" path The directory `/usr/share/sounds/Pop/` is not accessible on NixOS because the directory `/usr` does not exist on NixOS. The package `pop-gtk-theme` exists in nixpkgs that provides this exact "theme sound" which upstream uses. Substitute the FHS path with the path of the `pop-gtk-theme` package from the Nix store. --- pkgs/by-name/co/cosmic-settings-daemon/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 1fea2c041514..3cdddb2bbc1b 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -3,6 +3,7 @@ fetchFromGitHub, stdenv, rustPlatform, + pop-gtk-theme, pkg-config, geoclue2-with-demo-agent, libinput, @@ -21,6 +22,11 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-DtwW6RxHnNh87Xu0NCULfUsHNzYU9tHtFKE9HO3rvME="; }; + postPatch = '' + substituteInPlace src/battery.rs \ + --replace-fail '/usr/share/sounds/Pop/' '${pop-gtk-theme}/share/sounds/Pop/' + ''; + useFetchCargoVendor = true; cargoHash = "sha256-lGzQBL9IXbPsaKeVHp34xkm5FnTxWvfw4wg3El4LZdA="; From f0734fe0ccc170183c095aa493fb5bf101baeaf8 Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Thu, 10 Apr 2025 21:17:01 +0530 Subject: [PATCH 230/240] cosmic-settings-daemon: substitute the GTK3 theme path The directory `/usr/share/themes/adw-gtk3*` is not accessible on NixOS because the directory `/usr` does not exist on NixOS. The package `adw-gtk3` exists in nixpkgs that provides this exact GTK theme which upstream uses. Substitute the FHS path with the path of the `adw-gtk3` package from the Nix store. --- pkgs/by-name/co/cosmic-settings-daemon/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 3cdddb2bbc1b..1b0f3cebb46b 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -4,6 +4,7 @@ stdenv, rustPlatform, pop-gtk-theme, + adw-gtk3, pkg-config, geoclue2-with-demo-agent, libinput, @@ -25,6 +26,8 @@ rustPlatform.buildRustPackage (finalAttrs: { postPatch = '' substituteInPlace src/battery.rs \ --replace-fail '/usr/share/sounds/Pop/' '${pop-gtk-theme}/share/sounds/Pop/' + substituteInPlace src/theme.rs \ + --replace-fail '/usr/share/themes/adw-gtk3' '${adw-gtk3}/share/themes/adw-gtk3' ''; useFetchCargoVendor = true; From 4902fc986616b415da6bf3cc2bc8a624ae53c73d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 10 Apr 2025 21:22:23 +0200 Subject: [PATCH 231/240] python312Packages.tensorflow-metadata: 1.17.0 -> 1.17.1 Diff: https://github.com/tensorflow/metadata/compare/refs/tags/v1.17.0...refs/tags/v1.17.1 --- .../python-modules/tensorflow-metadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index 3d1c3fa3ad23..b961578c8810 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "tensorflow-metadata"; - version = "1.17.0"; + version = "1.17.1"; pyproject = true; src = fetchFromGitHub { owner = "tensorflow"; repo = "metadata"; tag = "v${version}"; - hash = "sha256-DD37l5Sqsn6m9mrRagKi/pi3GKjhO1HzEkEfmnhItqI="; + hash = "sha256-/jVAGt3nKPwVk+poXzQ9tVCi9HEZENrbjeN4dcOfWeo="; }; patches = [ ./build.patch ]; From c2471f0962601d1c1bf946e2ccb6df65a9a7f47e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 19:33:51 +0000 Subject: [PATCH 232/240] terraform-providers.bigip: 1.22.8 -> 1.22.9 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 85aa22a24bc4..5800ab33d54c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -162,11 +162,11 @@ "vendorHash": null }, "bigip": { - "hash": "sha256-I77ERUEEBIwco1t/fCZ266gJ7G6GXIug+6Df0OC6XgU=", + "hash": "sha256-MVnqTt9Hsc2wqKbCK+mEpNnNf1mKU6NgTPxO/8LZbaw=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.22.8", + "rev": "v1.22.9", "spdx": "MPL-2.0", "vendorHash": null }, From d19cf9dfc633816a437204555afeb9e722386b76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 19:29:07 +0000 Subject: [PATCH 233/240] pt2-clone: 1.72 -> 1.73 --- pkgs/by-name/pt/pt2-clone/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pt/pt2-clone/package.nix b/pkgs/by-name/pt/pt2-clone/package.nix index 99042320dd60..2b2acb462878 100644 --- a/pkgs/by-name/pt/pt2-clone/package.nix +++ b/pkgs/by-name/pt/pt2-clone/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pt2-clone"; - version = "1.72"; + version = "1.73"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Laq2C2bjLqeyT8eRH0DVjGmGg8R3TBfFL3XzwXTzKzo="; + sha256 = "sha256-x7pAMa5Bs7Wc/rnQgEoxV0h1TbvNp5Q+vtlNXmyEgSw="; }; nativeBuildInputs = [ cmake ]; From c14d6c992b7e1709a62b93f10a242b04737b66f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 20:29:38 +0000 Subject: [PATCH 234/240] python312Packages.jupyter-collaboration-ui: 1.1.0 -> 2.0.1 --- .../python-modules/jupyter-collaboration-ui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix b/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix index ffa3cd0388f0..2674aa7a8a11 100644 --- a/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "jupyter-collaboration-ui"; - version = "1.1.0"; + version = "2.0.1"; pyproject = true; src = fetchPypi { pname = "jupyter_collaboration_ui"; inherit version; - hash = "sha256-5TbKC6zhVVv6vaewUlL27ZP91R+ge/6wFBcKbGlVMHA="; + hash = "sha256-9UONyyhvhpywCVNbGtZz9eL8EGUS4XBM1zEY1RWsomY="; }; postPatch = '' From 3e2160b9c48b459a13e72947fa262f666adc4b42 Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Mon, 7 Apr 2025 09:20:58 +0530 Subject: [PATCH 235/240] maintainers/team-list: cosmic: init --- maintainers/team-list.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index dc142826055b..5acd5be85586 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -216,6 +216,24 @@ with lib.maintainers; enableFeatureFreezePing = true; }; + cosmic = { + members = [ + a-kenji + ahoneybun + drakon64 + griffi-gh + HeitorAugustoLN + nyabinary + pandapip1 + qyliss + thefossguy + ]; + githubTeams = [ "cosmic" ]; + shortName = "cosmic"; + scope = "Maintain the COSMIC DE and related packages."; + enableFeatureFreezePing = true; + }; + cuda = { members = [ connorbaker From 2e357178b5734c308c800a7110dca20f2de8c8a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 21:02:38 +0000 Subject: [PATCH 236/240] python312Packages.jupyter-server-ydoc: 1.1.0 -> 2.0.1 --- .../python-modules/jupyter-server-ydoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix index bdae4a8669ec..f0036fe14df4 100644 --- a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "jupyter-server-ydoc"; - version = "1.1.0"; + version = "2.0.1"; pyproject = true; src = fetchPypi { pname = "jupyter_server_ydoc"; inherit version; - hash = "sha256-Jw7FFBilQegSSTVXgWM7ccEw4r9KCQXIjqI7bOUIDW8="; + hash = "sha256-9P2n9D0HUkU+lmIffniD7tAJEUbe7Q7jjC/l+Cxps/U="; }; build-system = [ hatchling ]; From e834cc89919a1d42fd252070da588908fbb59a66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 21:08:18 +0000 Subject: [PATCH 237/240] python312Packages.jupyter-docprovider: 1.1.0 -> 2.0.1 --- .../python-modules/jupyter-docprovider/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-docprovider/default.nix b/pkgs/development/python-modules/jupyter-docprovider/default.nix index 21d7d9dc6873..db74157af7db 100644 --- a/pkgs/development/python-modules/jupyter-docprovider/default.nix +++ b/pkgs/development/python-modules/jupyter-docprovider/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "jupyter-docprovider"; - version = "1.1.0"; + version = "2.0.1"; pyproject = true; src = fetchPypi { pname = "jupyter_docprovider"; inherit version; - hash = "sha256-wt3I2agjKf/wqVJhzIJ7ZpNZh2r3+y8rr6jb34OasXI="; + hash = "sha256-4pyF5HDQ7dP32R+O3QN8DWtvJpQxBBbjWXaRAfs10b4="; }; postPatch = '' From e1c64c34cbb9fef4171f5f5c5ea6ce98d1c486dc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 10 Apr 2025 20:51:57 +0200 Subject: [PATCH 238/240] python312Packages.jaxopt: 0.8.3 -> 0.8.4 Diff: https://github.com/google/jaxopt/compare/refs/tags/jaxopt-v0.8.3...jaxopt-v0.8.4 Changelog: https://github.com/google/jaxopt/releases/tag/jaxopt-v0.8.4 --- .../python-modules/jaxopt/default.nix | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index c8ada5b43e31..90dff56e0cf9 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system setuptools, @@ -24,32 +23,16 @@ buildPythonPackage rec { pname = "jaxopt"; - version = "0.8.3"; + version = "0.8.4"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "jaxopt"; tag = "jaxopt-v${version}"; - hash = "sha256-T/BHSnuk3IRuLkBj3Hvb/tFIb7Au25jjQtvwL28OU1U="; + hash = "sha256-StuI9Z9wRjuvjsGoQUkcjoKbR6hNkGmOcddUc18yO3I="; }; - patches = [ - # fix failing tests from scipy 1.12 update - # https://github.com/google/jaxopt/pull/574 - (fetchpatch { - name = "scipy-1.12-fix-tests.patch"; - url = "https://github.com/google/jaxopt/commit/48b09dc4cc93b6bc7e6764ed5d333f9b57f3493b.patch"; - hash = "sha256-v+617W7AhxA1Dzz+DBtljA4HHl89bRTuGi1QfatobNY="; - }) - # fix invalid string escape sequences - (fetchpatch { - name = "fix-escape-sequences.patch"; - url = "https://github.com/google/jaxopt/commit/f5bb530f5f000d0739c9b26eee2d32211eb99f40.patch"; - hash = "sha256-E0ZXIfzWxKHuiBn4lAWf7AjNtll7OJU/NGZm6PTmhzo="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ From 59f19d16811f442dffb290175a25bb4f9a3214b4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 11 Apr 2025 00:09:06 +0200 Subject: [PATCH 239/240] python312Packages.blackjax: ignore DeprecationWarnin in tests --- pkgs/development/python-modules/blackjax/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index e89e390771a7..7228669a13f9 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -49,6 +49,12 @@ buildPythonPackage rec { pytest-xdist ]; + pytestFlagsArray = [ + # DeprecationWarning: JAXopt is no longer maintained + "-W" + "ignore::DeprecationWarning" + ]; + disabledTestPaths = [ "tests/test_benchmarks.py" From c4f3b5762e18add70c11d8db0a9a2673e75d896a Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 11 Mar 2025 20:05:06 -0300 Subject: [PATCH 240/240] smpmgr: init at 0.12.0 Signed-off-by: Otavio Salvador --- pkgs/by-name/sm/smpmgr/package.nix | 56 ++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/by-name/sm/smpmgr/package.nix diff --git a/pkgs/by-name/sm/smpmgr/package.nix b/pkgs/by-name/sm/smpmgr/package.nix new file mode 100644 index 000000000000..a7c6be3a41f7 --- /dev/null +++ b/pkgs/by-name/sm/smpmgr/package.nix @@ -0,0 +1,56 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + versionCheckHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "smpmgr"; + version = "0.12.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "intercreate"; + repo = "smpmgr"; + tag = version; + hash = "sha256-HNL9e3D/uZwJI0d4escbhe51zKH7hBFAnCGZZuZdla4="; + }; + + build-system = with python3Packages; [ + poetry-core + poetry-dynamic-versioning + setuptools + ]; + + dependencies = with python3Packages; [ + readchar + smpclient + typer + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + versionCheckHook + ]; + + pythonRelaxDeps = [ + "typer" + "smpclient" + ]; + + versionCheckProgramArg = [ "--version" ]; + + pythonImportsCheck = [ + "smpmgr" + ]; + + meta = { + description = "Simple Management Protocol (SMP) Manager for remotely managing MCU firmware"; + homepage = "https://github.com/intercreate/smpmgr"; + changelog = "https://github.com/intercreate/smpmgr/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ otavio ]; + mainProgram = "smpmgr"; + }; +}