diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5d315ef24c2f..fef6397cb0ed 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13962,6 +13962,11 @@ githubId = 148352; name = "Jim Fowler"; }; + kitsunoff = { + github = "kitsunoff"; + githubId = 58953114; + name = "Maxim Belyy"; + }; Kitt3120 = { email = "nixpkgs@schweren.dev"; github = "Kitt3120"; diff --git a/pkgs/by-name/ci/cisco-packet-tracer_9/package.nix b/pkgs/by-name/ci/cisco-packet-tracer_9/package.nix index 8fc360fef57a..4dba6142cfc4 100644 --- a/pkgs/by-name/ci/cisco-packet-tracer_9/package.nix +++ b/pkgs/by-name/ci/cisco-packet-tracer_9/package.nix @@ -74,6 +74,10 @@ appimageTools.wrapType2 rec { install -Dm444 ${contents}/usr/share/icons/hicolor/48x48/apps/app.png $out/share/icons/hicolor/48x48/apps/cisco-packet-tracer-9.png cp -r ${contents}/usr/share/icons/gnome/48x48/mimetypes $out/share/icons/hicolor/48x48/ + + for desktop in $out/share/applications/*.desktop; do + sed -i '/^\[Desktop Entry\]/a StartupWMClass=PacketTracer' "$desktop" + done ''; meta = { diff --git a/pkgs/by-name/li/ligolo-ng/package.nix b/pkgs/by-name/li/ligolo-ng/package.nix index 50b59a1fa42a..ac04681ef196 100644 --- a/pkgs/by-name/li/ligolo-ng/package.nix +++ b/pkgs/by-name/li/ligolo-ng/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "ligolo-ng"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "nicocha30"; repo = "ligolo-ng"; tag = "v${finalAttrs.version}"; - hash = "sha256-ND0SFB0xj4WK6okNzChZWfK5bhNc4PTWuZoq/PodTW0="; + hash = "sha256-fh1TRJlF3NsLNLJBQXyA4if3goxPF1lYyPIaSOrawQM="; }; - vendorHash = "sha256-oc85xNPMFeaPC7TMcSh3i3Msd8sCJ5QGFmi2fKjcyvk="; + vendorHash = "sha256-dOh8IRsluAy0vdHEXmevQxPCU33afNeuNPTq4Sxxb2g="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index a0ccf8aff638..3bd95f8b1322 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -31,13 +31,13 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "modrinth-app-unwrapped"; - version = "0.10.27"; + version = "0.10.30"; src = fetchFromGitHub { owner = "modrinth"; repo = "code"; tag = "v${finalAttrs.version}"; - hash = "sha256-5KHxoOozqZMvq91oKZ18Hmt0W8r9Va0AJr0hWMmBCfs="; + hash = "sha256-qHRdWPpsMWgITx0i24zgm8K+I7LzFDOewOGfvjgbxgg="; }; patches = [ @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '1.0.0-local' '${finalAttrs.version}' ''; - cargoHash = "sha256-OQVHG0iUyYcpc63N4Y3i8oWohDO4JBUIk3LEAf6ifL0="; + cargoHash = "sha256-hqEBGyMaAz8B11eHMm/r+6ItLnHmvSD9sD1uVNNQfxA="; mitmCache = gradle.fetchDeps { inherit (finalAttrs) pname; data = ./deps.json; @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_9; fetcherVersion = 1; - hash = "sha256-N57RSuVRX33AhQBjHbxR0g9q62rYVqAlYJ1dhuUu0xw="; + hash = "sha256-+/PGCoHAC9Hsl2YEdjvUBzDJi9iBf+ZxT/6yjDE3yBo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index 55f18669f618..1f6f75f1a1db 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "s7"; - version = "11.7-unstable-2026-02-12"; + version = "11.7-unstable-2026-02-20"; src = fetchFromGitLab { domain = "cm-gitlab.stanford.edu"; owner = "bil"; repo = "s7"; - rev = "7ce9e00589f550f9abc30c84e163c34ed1f511fe"; - hash = "sha256-gcOFlW5usE7oBqFAmOCEVoXTQNCbMQ0jPR3roN5ZcPk="; + rev = "d4abc485036d30b65bc80ef041690a1d1fc371c8"; + hash = "sha256-nJskuS4WM58na0ohsNppqKiOLa98TInXkaWvPzhctoY="; }; buildInputs = diff --git a/pkgs/by-name/sh/shrinkray/package.nix b/pkgs/by-name/sh/shrinkray/package.nix index 666d26cc3efb..c7e16519b944 100644 --- a/pkgs/by-name/sh/shrinkray/package.nix +++ b/pkgs/by-name/sh/shrinkray/package.nix @@ -12,14 +12,14 @@ python3.pkgs.buildPythonApplication rec { pname = "shrinkray"; - version = "26.2.4.1"; + version = "26.2.20.0"; pyproject = true; src = fetchFromGitHub { owner = "DRMacIver"; repo = "shrinkray"; tag = "v${version}"; - hash = "sha256-y8NZJ80KM+wW58YAWT7Cx3uh08imI7sbs487GbANyJg="; + hash = "sha256-KsIWFR5gyFt35yLz/102hET+JMhEU0ukhzwb9MzewSs="; }; postPatch = '' substituteInPlace tests/test_main.py \ diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix index 3d8b5c8f60e5..7981bc0ee861 100644 --- a/pkgs/by-name/si/sile/package.nix +++ b/pkgs/by-name/si/sile/package.nix @@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { poppler-utils finalAttrs.finalPackage ]; - inherit (finalAttrs) FONTCONFIG_FILE; + env.FONTCONFIG_FILE = finalAttrs.env.FONTCONFIG_FILE; } '' output=$(mktemp -t selfcheck-XXXXXX.pdf) diff --git a/pkgs/by-name/si/sizelint/package.nix b/pkgs/by-name/si/sizelint/package.nix index a0f0b1152951..f42f6c1c7b21 100644 --- a/pkgs/by-name/si/sizelint/package.nix +++ b/pkgs/by-name/si/sizelint/package.nix @@ -2,20 +2,23 @@ lib, rustPlatform, fetchFromGitHub, + git, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "sizelint"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "a-kenji"; repo = "sizelint"; tag = "v${finalAttrs.version}"; - hash = "sha256-06RJrE0w1Xhj364dUUuYadxleX12mkB8yO+h1QLZhH0="; + hash = "sha256-1k1+7fVWhflEKyhOlb7kMn2xqeAM6Y5N9uHtOJvVn4A="; }; - cargoHash = "sha256-1kg1xfgzqrbZvazRavM4aW7oyRei9jKW0a+a6z2HLnc="; + nativeCheckInputs = [ git ]; + + cargoHash = "sha256-Z+pmlp/0LlKfc4QLosePw7TdLFYe6AnAVOJSw2DzlfI="; meta = { description = "Lint your file tree based on file sizes"; diff --git a/pkgs/by-name/sp/splayer/package.nix b/pkgs/by-name/sp/splayer/package.nix index 0409c0dcd9a1..200b68c320ff 100644 --- a/pkgs/by-name/sp/splayer/package.nix +++ b/pkgs/by-name/sp/splayer/package.nix @@ -11,6 +11,8 @@ cargo, rustc, python3, + pkg-config, + openssl, makeWrapper, copyDesktopItems, makeDesktopItem, @@ -19,14 +21,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "splayer"; - version = "3.0.0-beta.9"; + version = "3.0.0"; src = fetchFromGitHub { owner = "imsyy"; repo = "SPlayer"; tag = "v${finalAttrs.version}"; fetchSubmodules = false; - hash = "sha256-+9F4ckATxRE+/PhMi5c1GVDq5V9QMOogCD9uT6QkREM="; + hash = "sha256-E29TJlp7nMokJbbi/YLuYf9qWmwvo/r4qQckKrVyumI="; }; pnpmDeps = fetchPnpmDeps { @@ -37,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_10; fetcherVersion = 2; - hash = "sha256-tAOtrxQasIQ1IS2jKdcX4KEM5p3zhshqw8phzsj667Q="; + hash = "sha256-PTfZopse+9RS7qh0miLu3duYlWDfifZS254tZKqgxKk="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -46,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { version src ; - hash = "sha256-QKk1coOuZNaqKgvbBgorvOotHmTJ+YXTHBfyhF0L37E="; + hash = "sha256-gd/5f3yraTQI5bu1VE6HHsGDeKJLR1oTm2H+pg1PAOA="; }; nativeBuildInputs = [ @@ -59,6 +61,11 @@ stdenv.mkDerivation (finalAttrs: { python3 makeWrapper copyDesktopItems + pkg-config + ]; + + buildInputs = [ + openssl ]; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -84,12 +91,12 @@ stdenv.mkDerivation (finalAttrs: { for f in $(find . -path '*/node_modules/better-sqlite3' -type d); do (cd "$f" && ( npm run build-release --offline --nodedir="${electron.headers}" + rm -rf build/Release/{.deps,obj,obj.target,test_extension.node} find build -type f -exec \ ${lib.getExe removeReferencesTo} \ -t "${electron.headers}" {} \; )) done - rm -rf build/Release/{.deps,obj,obj.target,test_extension.node} pnpm build diff --git a/pkgs/by-name/ta/talm/package.nix b/pkgs/by-name/ta/talm/package.nix new file mode 100644 index 000000000000..41d05681738e --- /dev/null +++ b/pkgs/by-name/ta/talm/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + nix-update-script, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "talm"; + version = "0.22.1"; + + src = fetchFromGitHub { + owner = "cozystack"; + repo = "talm"; + tag = "v${finalAttrs.version}"; + hash = "sha256-I3rSpFCNMoA5tAp3WVLM6Ae7Vo8m+9px9fg7Fgw0/oA="; + }; + + vendorHash = "sha256-jDp1WVETDbCtSq+v0BrIiTqoR2cnmI7JXdy5ydnt5wA="; + + nativeBuildInputs = [ installShellFiles ]; + + # go.mod requires 1.25.6 but nixpkgs has 1.25.5 + preBuild = '' + substituteInPlace go.mod --replace-fail "go 1.25.6" "go 1.25.5" + ''; + + ldflags = [ + "-s" + "-X main.Version=v${finalAttrs.version}" + ]; + + # Skip DNS test that fails in sandbox + checkFlags = [ "-skip=^TestRenderWithDNS$" ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd talm \ + --bash <($out/bin/talm completion bash) \ + --fish <($out/bin/talm completion fish) \ + --zsh <($out/bin/talm completion zsh) + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Manage Talos Linux the GitOps way"; + homepage = "https://github.com/cozystack/talm"; + changelog = "https://github.com/cozystack/talm/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ kitsunoff ]; + mainProgram = "talm"; + }; +}) diff --git a/pkgs/by-name/ta/tart/package.nix b/pkgs/by-name/ta/tart/package.nix index 6cc236425ba9..e01a60ea1fe4 100644 --- a/pkgs/by-name/ta/tart/package.nix +++ b/pkgs/by-name/ta/tart/package.nix @@ -14,11 +14,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.30.3"; + version = "2.30.6"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart.tar.gz"; - hash = "sha256-dV+WxjY3dVF7oFpUNPyVk2nWupbn44dOff/Z6TUqPks="; + hash = "sha256-wepqDaJp1oRjGqEVrXUM/JO5gfAKc12AUkZUbfwwdx0="; }; sourceRoot = "."; diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 61ac0a51cfdc..d1ddfa6cbc07 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -34,9 +34,11 @@ stdenv.mkDerivation (finalAttrs: { ]; # Complains about not being able to find the fontconfig config file otherwise - env.FONTCONFIG_FILE = lib.optional docSupport (makeFontsConf { - fontDirectories = [ ]; - }); + env = lib.optionalAttrs docSupport { + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ ]; + }; + }; nativeBuildInputs = [ cmake diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 9a3068b54d32..7b21d42a24a1 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -26,19 +26,19 @@ buildPythonPackage (finalAttrs: { pname = "jupyter-book"; - version = "2.1.2"; + version = "2.1.3"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-book"; repo = "jupyter-book"; tag = "v${finalAttrs.version}"; - hash = "sha256-eICmprxo/7E3GHVX4yK+L86pYHfQCBlx9WskbnBFCnY="; + hash = "sha256-RFISKdBziLHeyB+942PeBYR0kxrRFLgg3sn5laYk3qM="; }; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - hash = "sha256-uPmB6zrP1ESX7J3f5ppr7Yk9BupH8KI7a5OnYc/nN5M="; + hash = "sha256-5qVmVQ3k1LOjN4qsTxHzWmJmJWu2mv/a3s+7N7dZUxc="; }; build-system = [ diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index 7535561c19c9..7fe0ec01b2ea 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -21,19 +21,19 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyter-collaboration"; - version = "4.2.0"; + version = "4.2.1"; pyproject = true; src = fetchFromGitHub { owner = "jupyterlab"; repo = "jupyter-collaboration"; - tag = "v${version}"; - hash = "sha256-KXD5RRRh8cwZWZUpJrkS7RAfaeTjAHajKLl8c5MuhrA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-09fJT81nWGvUME3QU5hk2886y93ssl3IlVSIblxqJ78="; }; - sourceRoot = "${src.name}/projects/jupyter-collaboration"; + sourceRoot = "${finalAttrs.src.name}/projects/jupyter-collaboration"; build-system = [ hatchling ]; @@ -74,8 +74,8 @@ buildPythonPackage rec { meta = { description = "JupyterLab Extension enabling Real-Time Collaboration"; homepage = "https://github.com/jupyterlab/jupyter_collaboration"; - changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.bsd3; teams = [ lib.teams.jupyter ]; }; -} +}) diff --git a/pkgs/development/python-modules/mistralai/default.nix b/pkgs/development/python-modules/mistralai/default.nix index eb340788d90d..e2870952868c 100644 --- a/pkgs/development/python-modules/mistralai/default.nix +++ b/pkgs/development/python-modules/mistralai/default.nix @@ -31,14 +31,14 @@ buildPythonPackage (finalAttrs: { pname = "mistralai"; - version = "1.12.2"; + version = "1.12.3"; pyproject = true; src = fetchFromGitHub { owner = "mistralai"; repo = "client-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-95aHaZx4nZjqX456CGB7gAeoxkMu4tN7TMUbmxajgKU="; + hash = "sha256-DaCAO4/DoskFuRgNcoLWBuRdnxXfYhsgY/WZu/s1wk0="; }; preBuild = '' diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix index 7aacaac98521..1a5fd741a184 100644 --- a/pkgs/development/python-modules/oelint-data/default.nix +++ b/pkgs/development/python-modules/oelint-data/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "oelint-data"; - version = "1.4.0"; + version = "1.4.2"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-data"; tag = finalAttrs.version; - hash = "sha256-OrKwf7ADi0WUsFgsroFJvQxVB5RRsqjyZn6aZTixmFA="; + hash = "sha256-kaJ6Qalqg2jyCfgJuXpKCvj5SHYetmAobnEJ09Y9gFQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix index d193fc110bfc..e1c8319ac354 100644 --- a/pkgs/development/python-modules/sagemaker-core/default.nix +++ b/pkgs/development/python-modules/sagemaker-core/default.nix @@ -28,14 +28,14 @@ buildPythonPackage (finalAttrs: { pname = "sagemaker-core"; - version = "1.0.76"; + version = "1.0.77"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-core"; tag = "v${finalAttrs.version}"; - hash = "sha256-IAgHAmmN00nyE1rcPV09DMb/LFCZnwrD0OhXTeNuTik="; + hash = "sha256-UWoRYMk2QUjgCaa76xJ8o6OyAiM0Zyf4jXgT4AYm8PM="; }; build-system = [ diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index e492fcf790c1..2298a82dca23 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "textual"; - version = "7.5.0"; + version = "8.0.0"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "textual"; tag = "v${version}"; - hash = "sha256-1QtWrh05ATKLIVSByWusYcEHEeH8+9qsSdyTNBzh9L0="; + hash = "sha256-oigPcAlv0Xynl6V7Re5INYnefpyri556019/jRHauT4="; }; build-system = [ poetry-core ];