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 < qt5compat != null; - -stdenv.mkDerivation (finalAttrs: { - pname = "bambootracker"; - version = "0.6.4"; - - src = fetchFromGitHub { - owner = "BambooTracker"; - repo = "BambooTracker"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-tFUliKR55iZybNyYIF1FXh8RGf8jKEsGrWBuldB277g="; - }; - - 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 - substituteInPlace BambooTracker/lang/lang.pri \ - --replace 'equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 12)' 'if(true)' - ''; - - nativeBuildInputs = [ - pkg-config - qmake - qttools - wrapQtAppsHook - ]; - - buildInputs = - [ - qtbase - rtaudio_6 - rtmidi - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland - ] - ++ lib.optionals (lib.versionAtLeast qtbase.version "6.0") [ - qt5compat - ]; - - qmakeFlags = - [ - "CONFIG+=system_rtaudio" - "CONFIG+=system_rtmidi" - ] - ++ lib.optionals (stdenv.cc.isClang || (lib.versionAtLeast qtbase.version "6.0")) [ - # Clang is extra-strict about some deprecations - # Latest Qt6 deprecated QCheckBox::stateChanged(int) - "CONFIG+=no_warnings_are_errors" - ]; - - postConfigure = "make qmake_all"; - - # Wrapping the inside of the app bundles, avoiding double-wrapping - dontWrapQtApps = stdenv.hostPlatform.isDarwin; - - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Applications - mv $out/{bin,Applications}/BambooTracker.app - ln -s $out/{Applications/BambooTracker.app/Contents/MacOS,bin}/BambooTracker - wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker - ''; - - passthru = { - updateScript = gitUpdater { - rev-prefix = "v"; - }; - }; - - meta = with lib; { - 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 ]; - }; -}) 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"))) 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/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 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 { }; diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/applications/misc/protonup-qt/default.nix deleted file mode 100644 index ac0fd3ad52f3..000000000000 --- a/pkgs/applications/misc/protonup-qt/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - appimageTools, - fetchurl, - lib, -}: -let - 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="; - }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - 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}' - ''; - - extraPkgs = pkgs: with pkgs; [ zstd ]; - - meta = with lib; { - 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 ]; - mainProgram = "protonup-qt"; - changelog = "https://github.com/DavidoTek/ProtonUp-Qt/releases/tag/v${version}"; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ michaelBelsanti ]; - }; -} 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 = 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", diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 85aa22a24bc4..f20b4a6de371 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 }, @@ -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=", @@ -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=" }, @@ -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=", @@ -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 }, @@ -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=" } } 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="; 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 [ diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index fabcfbd708dd..1f7966a64271 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 = [ @@ -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 ''; 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"; }; } 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 ] } 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 = [ 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}}" 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; }; -} +}) 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" 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="; 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 ]; + }; +} diff --git a/pkgs/by-name/ba/bambootracker/package.nix b/pkgs/by-name/ba/bambootracker/package.nix new file mode 100644 index 000000000000..5b96caa3e842 --- /dev/null +++ b/pkgs/by-name/ba/bambootracker/package.nix @@ -0,0 +1,125 @@ +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + gitUpdater, + libsForQt5, + pkg-config, + qt6Packages, + rtaudio_6, + rtmidi, + withQt6 ? false, +}: + +let + qtPackages = if withQt6 then qt6Packages else libsForQt5; +in +stdenv.mkDerivation (finalAttrs: { + pname = "bambootracker" + lib.optionalString withQt6 "-qt6"; + version = "0.6.5"; + + src = fetchFromGitHub { + owner = "BambooTracker"; + repo = "BambooTracker"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + 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 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 + ] + ++ (with qtPackages; [ + qmake + qttools + wrapQtAppsHook + ]); + + buildInputs = + [ + rtaudio_6 + rtmidi + ] + ++ ( + with qtPackages; + [ + qtbase + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + qtwayland + ] + ++ lib.optionals withQt6 [ + qt5compat + ] + ); + + qmakeFlags = + [ + "CONFIG+=system_rtaudio" + "CONFIG+=system_rtmidi" + ] + ++ lib.optionals stdenv.cc.isClang [ + # Clang is extra-strict about some deprecations + # https://github.com/BambooTracker/BambooTracker/issues/506 + "CONFIG+=no_warnings_are_errors" + ]; + + postConfigure = "make qmake_all"; + + # Wrapping the inside of the app bundles, avoiding double-wrapping + dontWrapQtApps = stdenv.hostPlatform.isDarwin; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + mv $out/{bin,Applications}/BambooTracker.app + ln -s $out/{Applications/BambooTracker.app/Contents/MacOS,bin}/BambooTracker + wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker + ''; + + passthru = { + updateScript = gitUpdater { + rev-prefix = "v"; + }; + }; + + 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 = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ OPNA2608 ]; + }; +}) 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="; 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 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 = '' 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 ]; + }; +} 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 = [ 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"; 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 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 ]; 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="; 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 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 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="; 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="; diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 1fea2c041514..1b0f3cebb46b 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -3,6 +3,8 @@ fetchFromGitHub, stdenv, rustPlatform, + pop-gtk-theme, + adw-gtk3, pkg-config, geoclue2-with-demo-agent, libinput, @@ -21,6 +23,13 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-DtwW6RxHnNh87Xu0NCULfUsHNzYU9tHtFKE9HO3rvME="; }; + 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; cargoHash = "sha256-lGzQBL9IXbPsaKeVHp34xkm5FnTxWvfw4wg3El4LZdA="; 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 = [ 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; }; 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" ]; 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 = [ 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 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" ]; 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 ]; 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" ]; 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; [ 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 = [ 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 = [ "." ]; 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 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 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 = [ 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; 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 = [ "." 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 3d9cc47f9bb9..0e131cfa6e8e 100644 --- a/pkgs/by-name/gn/gnucash/package.nix +++ b/pkgs/by-name/gn/gnucash/package.nix @@ -25,6 +25,8 @@ swig, webkitgtk_4_0, wrapGAppsHook3, + python3, + replaceVars, }: stdenv.mkDerivation rec { @@ -45,6 +47,11 @@ stdenv.mkDerivation rec { pkg-config ]; + cmakeFlags = [ + "-DWITH_PYTHON=\"ON\"" + "-DPYTHON_SYSCONFIG_BUILD=\"$out\"" + ]; + buildInputs = [ aqbanking @@ -63,6 +70,7 @@ stdenv.mkDerivation rec { libxslt swig webkitgtk_4_0 + python3 ] ++ (with perlPackages; [ JSONParse @@ -79,8 +87,16 @@ 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 = '' + 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 # guile warning env.GUILE_AUTO_COMPILE = "0"; 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 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 ]; }; -} +}) 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 = '' 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; }) ]; 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 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; }; 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 = { diff --git a/pkgs/by-name/ic/icestudio/package.nix b/pkgs/by-name/ic/icestudio/package.nix index c1f3d027e7b4..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 ]; @@ -118,7 +120,7 @@ buildNpmPackage rec { rcoeurjoly amerino ] - ++ [ lib.teams.ngi ]; + ++ lib.teams.ngi.members; mainProgram = "icestudio"; platforms = lib.platforms.linux; }; 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)"; 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 = '' 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 ]; 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 = '' 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. 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" 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" 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; 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 = [ 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 = '' 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; }; 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 = [ "." ]; 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 = [ 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 = '' 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 = [ 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 = 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 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 = [ 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; diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix index c0bea6fdd240..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 ]; @@ -184,6 +184,7 @@ stdenv.mkDerivation (finalAttrs: { }; tests = { pythonMujoco = python3Packages.mujoco; + pythonMujocoMjx = python3Packages.mujoco-mjx; }; }; 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; + }; +}) 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: diff --git a/pkgs/tools/security/netexec/default.nix b/pkgs/by-name/ne/netexec/package.nix similarity index 96% rename from pkgs/tools/security/netexec/default.nix rename to pkgs/by-name/ne/netexec/package.nix index f3145427148f..0b7913cd8657 100644 --- a/pkgs/tools/security/netexec/default.nix +++ b/pkgs/by-name/ne/netexec/package.nix @@ -98,12 +98,12 @@ python.pkgs.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 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; 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 = [ 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" } } 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 diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/by-name/op/openroad/package.nix similarity index 55% rename from pkgs/applications/science/electronics/openroad/default.nix rename to pkgs/by-name/op/openroad/package.nix index ef9db55ef3f5..2023f2606825 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/by-name/op/openroad/package.nix @@ -1,50 +1,45 @@ { lib, - mkDerivation, + 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 -mkDerivation rec { +stdenv.mkDerivation rec { pname = "openroad"; version = "2.0-unstable-2025-03-01"; @@ -61,39 +56,42 @@ mkDerivation rec { cmake doxygen flex - git + gitMinimal gtest + libsForQt5.wrapQtAppsHook pkg-config swig ]; - 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 @@ 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 @@ 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; }; } 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 = [ 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 72% rename from pkgs/development/libraries/science/math/or-tools/default.nix rename to pkgs/by-name/or/or-tools/package.nix index 4457003bbadf..7e01246887bd 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.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 + 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/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. :') diff --git a/pkgs/servers/peertube/default.nix b/pkgs/by-name/pe/peertube/package.nix similarity index 95% rename from pkgs/servers/peertube/default.nix rename to pkgs/by-name/pe/peertube/package.nix index e62bf9005deb..0f99e03bab15 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, }: @@ -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 = [ @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { fd ]; - buildInputs = [ nodejs ]; + buildInputs = [ nodejs_18 ]; buildPhase = '' # Build node modules 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"; 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 = [ 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; 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; 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 = [ 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="; diff --git a/pkgs/by-name/pr/protonup-qt/package.nix b/pkgs/by-name/pr/protonup-qt/package.nix new file mode 100644 index 000000000000..2034a0f939af --- /dev/null +++ b/pkgs/by-name/pr/protonup-qt/package.nix @@ -0,0 +1,45 @@ +{ + lib, + appimageTools, + fetchurl, + makeWrapper, +}: + +appimageTools.wrapAppImage rec { + pname = "protonup-qt"; + version = "2.12.0"; + + 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="; + }; + }; + + nativeBuildInputs = [ makeWrapper ]; + + extraInstallCommands = '' + 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 = { + 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 = 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 lib.maintainers; [ michaelBelsanti ]; + }; +} diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index ffbd140a6627..702777675622 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, @@ -9,16 +10,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" @@ -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) \ 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 ]; 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 = [ 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())) + } 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 ]; 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 = '' 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 = [ 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 { 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"; + }; +} 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"; + }; +}) 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 = '' 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 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 = { 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 { 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 = [ 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"; 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 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" 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 = [ diff --git a/pkgs/by-name/tr/trojan-go/package.nix b/pkgs/by-name/tr/trojan-go/package.nix index 40087b8834b7..7724ca0924a6 100644 --- a/pkgs/by-name/tr/trojan-go/package.nix +++ b/pkgs/by-name/tr/trojan-go/package.nix @@ -19,6 +19,20 @@ 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" + "server" + "forward" + "nat" + "other" + ]; + # tests fail due to requiring networking doCheck = false; 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 = [ 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 = [ 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; 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 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.]+)" ]; }; 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 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 ]; }; -} +}) diff --git a/pkgs/by-name/wi/wireguard-go/package.nix b/pkgs/by-name/wi/wireguard-go/package.nix new file mode 100644 index 000000000000..b77c1ea2f827 --- /dev/null +++ b/pkgs/by-name/wi/wireguard-go/package.nix @@ -0,0 +1,74 @@ +{ + lib, + buildGoModule, + fetchzip, + testers, + wireguard-go, +}: + +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-${rev}.tar.xz"; + hash = "sha256-br7/dwr/e4HvBGJXh+6lWqxBUezt5iZNy9BFqEA1bLk="; + }; + + postPatch = '' + # Skip formatting tests + rm -f format_test.go + + # Inject version + printf 'package main\n\nconst Version = "${shortVer}"' > version.go + ''; + + vendorHash = "sha256-RqZ/3+Xus5N1raiUTUpiKVBs/lrJQcSwr1dJib2ytwc="; + + subPackages = [ "." ]; + + ldflags = [ "-s" ]; + + # 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 + ''; + + 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 + winter + zx2c4 + ]; + mainProgram = "wireguard-go"; + }; + } +) 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..e04999b8262c --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "bypass.yazi"; + version = "0-unstable-2025-02-16"; + + src = fetchFromGitHub { + owner = "Rolv-Apneseth"; + repo = "bypass.yazi"; + rev = "ecb1f7f6fd305ff4ffff548fa955595af6b26e60"; + hash = "sha256-XXp4XflrVrs8FrUCRUbSxWZTSGPrIGrpqvB1pARerKQ="; + }; + + 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 ]; + }; +} 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..ea34d479322e --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/chmod/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "chmod.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + 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 ]; + }; +} 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..170dedda57b6 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/default.nix @@ -0,0 +1,76 @@ +{ + lib, + callPackage, + stdenvNoCC, + writeShellScript, +}: +let + root = ./.; + updateScript = ./update.py; + + mkYaziPlugin = + args@{ + pname, + src, + meta ? { }, + installPhase ? null, + ... + }: + let + # Extract the plugin name from pname (removing .yazi suffix if present) + pluginName = lib.removeSuffix ".yazi" pname; + in + 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; + }; + passthru = (args.passthru or { }) // { + updateScript = { + command = writeShellScript "update-${pluginName}" '' + export PLUGIN_NAME="${pluginName}" + export PLUGIN_PNAME="${pname}" + exec ${updateScript} + ''; + supportedFeatures = [ "commit" ]; + }; + }; + } + ); + + 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 new file mode 100644 index 000000000000..f8500fc742c1 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/diff/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "diff.yazi"; + version = "25.2.7-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + 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 ]; + }; +} 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..90bbaf5f64ec --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/full-border/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "full-border.yazi"; + version = "25.2.26-unstable-2025-03-11"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "92f78dc6d0a42569fd0e9df8f70670648b8afb78"; + hash = "sha256-mqo71VLZsHmgTybxgqKNo9F2QeMuCSvZ89uen1VbWb4="; + }; + + 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/by-name/ya/yazi/plugins/git/default.nix b/pkgs/by-name/ya/yazi/plugins/git/default.nix new file mode 100644 index 000000000000..10b6b29acd8b --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/git/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "git.yazi"; + version = "25.4.4-unstable-2025-04-04"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "9a095057d698aaaedc4dd23d638285bd3fd647e9"; + hash = "sha256-Lx+TliqMuaXpjaUtjdUac7ODg2yc3yrd1mSWJo9Mz2Q="; + }; + + 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 ]; + }; +} 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..b37e7481151c --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/glow/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "glow.yazi"; + version = "0-unstable-2025-02-22"; + + src = fetchFromGitHub { + owner = "Reledia"; + repo = "glow.yazi"; + rev = "c76bf4fb612079480d305fe6fe570bddfe4f99d3"; + hash = "sha256-DPud1Mfagl2z490f5L69ZPnZmVCa0ROXtFeDbEegBBU="; + }; + + meta = { + description = "Glow preview plugin for yazi."; + homepage = "https://github.com/Reledia/glow.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} 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..55269a5e7b04 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/jump-to-char/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + 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="; + }; + + 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 ]; + }; +} 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..95dbfcdf8aa1 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/lsar/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "lsar.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + meta = { + description = "Previewing archive contents with lsar"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} 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..991d71f97c7c --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/mactag/default.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "mactag.yazi"; + version = "25.4.4-unstable-2025-04-04"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "9a095057d698aaaedc4dd23d638285bd3fd647e9"; + hash = "sha256-Lx+TliqMuaXpjaUtjdUac7ODg2yc3yrd1mSWJo9Mz2Q="; + }; + + 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; + }; +} 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..a1612b59e64a --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + 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="; + }; + + meta = { + description = "Yazi plugin for previewing media files."; + homepage = "https://github.com/boydaihungst/mediainfo.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} 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..abc48218c54f --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/miller/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "miller.yazi"; + version = "0-unstable-2024-08-28"; + + src = fetchFromGitHub { + owner = "Reledia"; + repo = "miller.yazi"; + rev = "40e02654725a9902b689114537626207cbf23436"; + hash = "sha256-GXZZ/vI52rSw573hoMmspnuzFoBXDLcA0fqjF76CdnY="; + }; + + meta = { + description = "Miller, now in yazi."; + homepage = "https://github.com/Reledia/miller.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} 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..59a92e126702 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/mime-ext/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "mime-ext.yazi"; + version = "25.4.4-unstable-2025-04-04"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "9a095057d698aaaedc4dd23d638285bd3fd647e9"; + hash = "sha256-Lx+TliqMuaXpjaUtjdUac7ODg2yc3yrd1mSWJo9Mz2Q="; + }; + + meta = { + description = "Previewing archive contents with mime-ext"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} 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..062c728c49bd --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/mount/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "mount.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b44c245500b34e713732a9130bf436b13b4777e9"; + hash = "sha256-nZ8yfnKvNLM5aA+mmQ3PkfM5lwSKwWnkQewcg9GwseI="; + }; + + meta = { + description = "Previewing archive contents with mount"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} 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..bf66c5235d47 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/no-status/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + 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="; + }; + + meta = { + description = "Previewing archive contents with no-status"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} 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..2a6fa7c70853 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "ouch.yazi"; + version = "0-unstable-2025-03-29"; + + src = fetchFromGitHub { + owner = "ndtoan96"; + repo = "ouch.yazi"; + rev = "558188d2479d73cafb7ad8fb1bee12b2b59fb607"; + hash = "sha256-7X8uAiJ8vBXYBXOgyKhVVikOnTBGrdCcXOJemjQNolI="; + }; + + meta = { + description = "A Yazi plugin to preview archives."; + homepage = "https://github.com/ndtoan96/ouch.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} 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..1ea04f712255 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + 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="; + }; + + 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 ]; + }; +} 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..ec1a45c27a9f --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/restore/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "restore.yazi"; + version = "25.2.7-unstable-2025-04-04"; + + src = fetchFromGitHub { + owner = "boydaihungst"; + repo = "restore.yazi"; + rev = "328dd888c1e2b9b0cb5dc806f099e3164e179620"; + hash = "sha256-3Z8P25u9bffdjrPjxLRWUQn6MdBS+vyElUBkgV4EUwY="; + }; + + meta = { + description = "Undo/Recover trashed files/folders."; + homepage = "https://github.com/boydaihungst/restore.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} 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..7e54ccdd12bf --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/smart-enter/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + 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="; + }; + + meta = { + description = "Previewing archive contents with smart-enter"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} 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..417147a95e70 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/smart-filter/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + 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="; + }; + + meta = { + description = "Previewing archive contents with smart-filter"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} 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..5d7394d9c9a9 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/starship/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "starship.yazi"; + version = "25.2.7-unstable-2025-02-23"; + + src = fetchFromGitHub { + owner = "Rolv-Apneseth"; + repo = "starship.yazi"; + rev = "6c639b474aabb17f5fecce18a4c97bf90b016512"; + hash = "sha256-bhLUziCDnF4QDCyysRn7Az35RAy8ibZIVUzoPgyEO1A="; + }; + + meta = { + description = "Starship prompt plugin for yazi."; + homepage = "https://github.com/Rolv-Apneseth/starship.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} 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..94a6d3538431 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/sudo/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "sudo.yazi"; + version = "0-unstable-2025-02-08"; + + src = fetchFromGitHub { + owner = "TD-Sky"; + repo = "sudo.yazi"; + rev = "af70636fbcf30ef17f77c5ffcfcbf1342c554be1"; + hash = "sha256-IvTBAhZrbrNJ5nsLxr35V0ntQw89yXUdoU9ashbflYY="; + }; + + meta = { + description = "Call `sudo` in yazi."; + homepage = "https://github.com/TD-Sky/sudo.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} 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..a77ea05970eb --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "toggle-pane.yazi"; + version = "25.2.26-unstable-2025-03-02"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "273019910c1111a388dd20e057606016f4bd0d17"; + hash = "sha256-80mR86UWgD11XuzpVNn56fmGRkvj0af2cFaZkU8M31I="; + }; + + meta = { + description = "Previewing archive contents with toggle-pane"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} 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/vcs-files/default.nix b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix new file mode 100644 index 000000000000..f83d4d766a21 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "vcs-files.yazi"; + version = "25.3.7-unstable-2025-03-07"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "273019910c1111a388dd20e057606016f4bd0d17"; + hash = "sha256-80mR86UWgD11XuzpVNn56fmGRkvj0af2cFaZkU8M31I="; + }; + + meta = { + description = "Previewing archive contents with vcs-files"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} 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 ]; }; 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" diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f15a12df8e9c..de31a5a203d4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -518,24 +518,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"; }) 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; }; -} +}) 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 = [ diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index ac310bb2e652..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, @@ -3564,15 +3594,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"; @@ -3595,15 +3625,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"; 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 { 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" 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/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 ]; 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 = [ 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 = [ 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 ]; 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" ]; 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; [ 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 = [ 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 = '' 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 = '' 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 ]; 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 = '' 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 = [ diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index cffed178ec60..40c8b266e840 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 ]; 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/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/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/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 ]; 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 = [ 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 ]; 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 = '' 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 = [ 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 = [ 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/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 = [ 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/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/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 ]; 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 ]; 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 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 = '' 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", diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index a42b6ba6e4ba..5aee6d9bad4f 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,35 +4,35 @@ "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", - "hash": "sha256:0vqk4wd0cacigz42gigdzbj415hcdn2k2m01yr7k8pcv3rxs86ck" + "version": "5.15.180", + "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", - "hash": "sha256:0vpgb3lmhgv5iw9b1z0kqr6vdv44if49marfp5858z3a8yj69bdk" + "version": "5.4.292", + "hash": "sha256:11dy6zvxnripwr4lfg357wdl70kcg5ljs3wxhz2klqpas60gbjqb" }, "6.6": { - "version": "6.6.86", - "hash": "sha256:0s1yy429g70iry559hsfv3plf787bik3kkd0mpx3a1z44dsavqs9" + "version": "6.6.87", + "hash": "sha256:1iks6msk4cajyy0khyhrwsdl123hr81n67xzdnhlgg6dvb1famw9" }, "6.12": { - "version": "6.12.22", - "hash": "sha256:0dkk6d9ml44q2kr7wd8px8iy3lwgyb2qmbhq4f6sg1crnh580j5b" + "version": "6.12.23", + "hash": "sha256:0jbps9sr4bpg4ym6vjib33lfjqjh09azh39ck7v7zsyyz0259nfq" }, "6.13": { - "version": "6.13.10", - "hash": "sha256:08kpzbysnabyjn76nk8f3zqxlsw45wkhw5vafrgr43vj3v1zrwjp" + "version": "6.13.11", + "hash": "sha256:08gcms4gvh8i30wj9vk27rb7d4yrndprxk1m72dhr1f7lywz2azn" }, "6.14": { - "version": "6.14.1", - "hash": "sha256:01z4cf2aivg0bs1i874kqldwxsspg53wvkyfy2nlzmlzhz8j5wav" + "version": "6.14.2", + "hash": "sha256:06rfg9bnn48his9km0nf38i3fp4ylws7v9apjc9r0cgaajiq5in5" } } 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; }; }; 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 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 = [ 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 [ diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix deleted file mode 100644 index 8e4908c20a7f..000000000000 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - buildGoModule, - fetchzip, - testers, - wireguard-go, -}: - -buildGoModule rec { - pname = "wireguard-go"; - version = "0.0.20230223"; - - src = fetchzip { - url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "sha256-ZVWbZwSpxQvxwySS3cfzdRReFtHWk6LT2AuIe10hyz0="; - }; - - postPatch = '' - # Skip formatting tests - rm -f format_test.go - ''; - - vendorHash = "sha256-i6ncA71R0hi1SzqCLphhtF3yRAHDmOdYJQ6pf3UDBg8="; - - subPackages = [ "." ]; - - ldflags = [ - "-s" - "-w" - ]; - - 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 - ]; - 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; - }; -} 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 cfa503f620ba..777bfbe0069d 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 6a721b2fd7aa..c546ece9ff5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3247,8 +3247,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; }; @@ -4179,8 +4177,6 @@ with pkgs; nanoemoji = with python3Packages; toPythonApplication nanoemoji; - netexec = callPackage ../tools/security/netexec { }; - netdata = callPackage ../tools/system/netdata { protobuf = protobuf_21; }; @@ -5660,8 +5656,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 { @@ -13832,8 +13826,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; @@ -14753,8 +14746,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 @@ -15770,10 +15761,6 @@ with pkgs; stdenv = gccStdenv; }; - peertube = callPackage ../servers/peertube { - nodejs = nodejs_18; - }; - photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { }; phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { }; @@ -18146,15 +18133,6 @@ with pkgs; nodejs = nodejs_20; }; - or-tools = callPackage ../development/libraries/science/math/or-tools { - inherit (darwin) DarwinTools; - python = python3; - 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; }; @@ -18498,8 +18476,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 { }; @@ -19559,6 +19535,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; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dfbfa013ef67..ff04496957d1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14918,6 +14918,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; [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9bd03dc24f39..9353b1c7e320 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2023,6 +2023,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 { }; @@ -5616,6 +5618,12 @@ self: super: with self; { gntp = callPackage ../development/python-modules/gntp { }; + gnucash = toPythonModule ( + pkgs.gnucash.override { + python3 = python; + } + ); + gnureadline = callPackage ../development/python-modules/gnureadline { }; go2rtc-client = callPackage ../development/python-modules/go2rtc-client { }; @@ -8787,6 +8795,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 { }; @@ -8811,6 +8821,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 = @@ -9081,6 +9093,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 { }; @@ -10441,7 +10455,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 { }; @@ -14255,6 +14269,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 { }; @@ -15899,6 +15915,10 @@ self: super: with self; { smolagents = callPackage ../development/python-modules/smolagents { }; + 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 { };