diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 15365b49c57e..848ec7504431 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -154,3 +154,5 @@ - If [`system.stateVersion`](#opt-system.stateVersion) is >=26.05, `pkgs.nextcloud33` will be installed by default. - If [`system.stateVersion`](#opt-system.stateVersion) is >=25.11, `pkgs.nextcloud32` will be installed by default. - Please note that Nextcloud prohibits skipping major versions while upgrading. You can upgrade to specific versions by declaring `services.nextcloud.package = pkgs.nextcloud33;`. + + - `trilium-desktop` and `trilium-server` have been updated to 0.104.0. This release includes security hardening fixes that may break functionality. [See upstream release note for details](https://github.com/TriliumNext/Trilium/releases/tag/v0.104.0). diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cb5ee223836e..9817fed4c45a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -842,13 +842,13 @@ "vendorHash": "sha256-EAv8EeNn0PJ3BElmg6sKkd/LXNe0lFjEIjHuZRG3CoQ=" }, "launchdarkly_launchdarkly": { - "hash": "sha256-PgAK0BUTSyW4CXssQkENohnhtd2O5GPuFVvSDcHWjQ8=", + "hash": "sha256-xQhWB5gUO10v7KXXHci3gvXlI/hg7JXsn9bYxHVGJwc=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.30.0", + "rev": "v2.30.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-OgKOjLwDQxJiv+VWdOzjMcUDPu9LOuhyTRyLyM39vLM=" + "vendorHash": "sha256-9RisIZUblqqylMW6Bz6ehpwRUXyvTdicuhEGI+n5G3Y=" }, "linode_linode": { "hash": "sha256-N/SVZ1ajNRT53zxdYBT6Hd/wwAuKhEre0QSZUYbkwGA=", diff --git a/pkgs/by-name/co/concord-tui/package.nix b/pkgs/by-name/co/concord-tui/package.nix index f2ea41311f2e..4b074f9052d5 100644 --- a/pkgs/by-name/co/concord-tui/package.nix +++ b/pkgs/by-name/co/concord-tui/package.nix @@ -7,8 +7,6 @@ opus, lib, stdenv, - # TODO: Clean up on `staging` - lld, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -33,21 +31,12 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ pkg-config cmake - ] - # TODO: Clean up on `staging` - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - lld ]; __darwinAllowLocalNetworking = true; __structuredAttrs = true; - # TODO: Clean up on `staging` - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' lld "ld64.lld"}"; - }; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/go/gotip/package.nix b/pkgs/by-name/go/gotip/package.nix index 92a8bc90b03d..e22811e695fa 100644 --- a/pkgs/by-name/go/gotip/package.nix +++ b/pkgs/by-name/go/gotip/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "gotip"; - version = "0.6.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lusingander"; repo = "gotip"; tag = "v${finalAttrs.version}"; - hash = "sha256-CgTznW4SwKrJ4Q7dIo2ebn51G13nP36tv8n2G9T+MZ0="; + hash = "sha256-W4N6O7cAUIFytjHIqbe7qSmuPHIpyhecw7bLyIP/LRU="; }; - vendorHash = "sha256-Sj7JzyWviGxp10O1zGONN49TXtwquXYJ1KoijIVcyj0="; + vendorHash = "sha256-fQ/rx7gyBcQ3nE/eiCJgtjZCa50iZAuodIZjaRG/mjE="; ldflags = [ "-s" diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index c3a792134167..e2f821f1ddc1 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "inputplumber"; - version = "0.77.7"; + version = "0.78.0"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${finalAttrs.version}"; - hash = "sha256-LECHrL+yopymcdpuEZUFvNX1QI30Z+mOtMYP7fnMpBM="; + hash = "sha256-wa05/gStEbXUZLvokY1N4k4f4/cPm2Kolbf+AF479lU="; }; - cargoHash = "sha256-1g4nHBu9LUMMr0bPkD4LCEFyyIc+GdhIWu+hlyGH3IM="; + cargoHash = "sha256-lScpMua5czwmnz/+fz+UrgZSWHwRNP7zB317xJS+6gs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 4769f157fa89..70a5fde765ef 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdeltachat"; - version = "2.53.0"; + version = "2.55.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${finalAttrs.version}"; - hash = "sha256-W2Yh5+6MaJ47GqJioGKge2J3RetGGTcl+0YxPPlSdDo="; + hash = "sha256-Iy0VeWfD0GXdQiGZbn95p9SJ4MUSYBwsYLnI5NvgUl4="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit (finalAttrs) version src; - hash = "sha256-aoPc5XvjwwuA9aOTvIOpTm15wozC9glJGqn3vPqsJF4="; + hash = "sha256-BfvLWldH4gbnB/ehywB40Ho1IZB/Kv5szmtMTVRsvqk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/makeBinaryWrapper/package.nix b/pkgs/by-name/ma/makeBinaryWrapper/package.nix index a844a586d800..c369119f16a1 100644 --- a/pkgs/by-name/ma/makeBinaryWrapper/package.nix +++ b/pkgs/by-name/ma/makeBinaryWrapper/package.nix @@ -24,9 +24,13 @@ makeSetupHook { passthru = { # Extract the function call used to create a binary wrapper from its embedded docstring - extractCmd = writeShellScript "extract-binary-wrapper-cmd" '' - ${targetPackages.gnuStdenv.cc.bintools.targetPrefix}strings -dw "$1" | sed -n '/^makeCWrapper/,/^$/ p' - ''; + extractCmd = + let + bintools = targetPackages.gnuStdenv.cc.bintools; + in + writeShellScript "extract-binary-wrapper-cmd" '' + ${lib.getExe' bintools "${bintools.targetPrefix}strings"} -dw "$1" | sed -n '/^makeCWrapper/,/^$/ p' + ''; tests = tests.makeBinaryWrapper; }; diff --git a/pkgs/by-name/mo/monkeys-audio/package.nix b/pkgs/by-name/mo/monkeys-audio/package.nix index caf9993a825b..696a05b02521 100644 --- a/pkgs/by-name/mo/monkeys-audio/package.nix +++ b/pkgs/by-name/mo/monkeys-audio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "13.18"; + version = "13.19"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-zNEEJSHdr89lsLGBIL2lXixSCk0Wj1kgT0GKpph5jXY="; + hash = "sha256-i2FNQB6ZMt2ZnWjVr3UDSqxHav/MAKuDwC+h+gXW/Ik="; stripRoot = false; }; diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py index 4ef5d68f2d88..c6c2e087cd0d 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py @@ -375,6 +375,7 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer): # Without this the popover can still be closed by clicking outside of it # It handles auto-closing when the user clicks a href. close_menu_js = """ + // { const nav = document.getElementById("manual-toc"); nav?.addEventListener("click", (e) => { @@ -383,6 +384,7 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer): } }); }); + //]]> """ intersection_observer_js = """ function createObserver() { diff --git a/pkgs/by-name/ph/photoprism/backend.nix b/pkgs/by-name/ph/photoprism/backend.nix index 199b59c61614..02632ec2fdb3 100644 --- a/pkgs/by-name/ph/photoprism/backend.nix +++ b/pkgs/by-name/ph/photoprism/backend.nix @@ -48,7 +48,7 @@ buildGoModule { substituteInPlace internal/commands/passwd.go --replace-fail '/bin/stty' "${coreutils}/bin/stty" ''; - vendorHash = "sha256-nOytOKceVuRryixDxx791my0JkdLPfyYdK6dAUG4CQc="; + vendorHash = "sha256-mF07Lz61IIvUi4SLIMkMlKMH9zm6Zrp/KAdutl+mUzI="; subPackages = [ "cmd/photoprism" ]; diff --git a/pkgs/by-name/ph/photoprism/frontend.nix b/pkgs/by-name/ph/photoprism/frontend.nix index f62a6cf3c792..14592d00d3d5 100644 --- a/pkgs/by-name/ph/photoprism/frontend.nix +++ b/pkgs/by-name/ph/photoprism/frontend.nix @@ -9,21 +9,15 @@ buildNpmPackage { inherit src version; pname = "photoprism-frontend"; - postPatch = '' - cd frontend - ''; + npmDepsHash = "sha256-HBzul2fyISwOqf8w92yt0friMnLhMmvKPm8yI2I3ngE="; - npmDepsHash = "sha256-RjPTtIm1BhyeQLUN9mWI+sXakNju4up0FbrdwZzkTS0="; - - # Some dependencies are fetched from git repositories - forceGitDeps = true; - makeCacheWritable = true; + npmWorkspace = "frontend"; installPhase = '' runHook preInstall mkdir $out - cp -r ../assets $out/ + cp -r assets $out/ runHook postInstall ''; diff --git a/pkgs/by-name/ph/photoprism/package.nix b/pkgs/by-name/ph/photoprism/package.nix index 646062501c4e..7b63054de7d6 100644 --- a/pkgs/by-name/ph/photoprism/package.nix +++ b/pkgs/by-name/ph/photoprism/package.nix @@ -17,14 +17,14 @@ }: let - version = "251130-b3068414c"; + version = "260601-a7d098548"; pname = "photoprism"; src = fetchFromGitHub { owner = "photoprism"; repo = "photoprism"; rev = version; - hash = "sha256-8yg5CtvBtSKRaOUj9f+Db7rruXIVuF2cR50vZ+WUU6A="; + hash = "sha256-6zE9bqHFF9ifcqbvA0yjSF69+BA/M2U6ABnPta4dpl4="; }; backend = callPackage ./backend.nix { inherit src version; }; diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index e0a50c92611f..cbd1e9d19fb4 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -10,17 +10,17 @@ }: let pname = "proton-pass"; - version = "1.38.0"; + version = "1.38.1"; passthru = { sources = { "x86_64-linux" = fetchurl { url = "https://proton.me/download/pass/linux/x64/proton-pass_${version}_amd64.deb"; - hash = "sha256-6WYiqEJquq64b1fNv8HcQcT4/VCwtEkK4YrfAXDC6nY="; + hash = "sha256-0DQy8ITOlR88aJiR4zLCIukd5KZ2U4PVSjNBvU/A9L8="; }; "aarch64-darwin" = fetchurl { url = "https://proton.me/download/pass/macos/ProtonPass_${version}.dmg"; - hash = "sha256-CwdiHEqKnk+ELoavs1p6ND48e2rvEFBqbXQs79ihQ4M="; + hash = "sha256-lEc/tP84QU+WDTqLbUe5dMmYBLXaZZg8wmXSNgAOn7g="; }; }; updateScript = writeShellScript "update-proton-pass" '' diff --git a/pkgs/by-name/ra/ramalama/package.nix b/pkgs/by-name/ra/ramalama/package.nix index 57743980dedf..9a3c24fca2dc 100644 --- a/pkgs/by-name/ra/ramalama/package.nix +++ b/pkgs/by-name/ra/ramalama/package.nix @@ -50,21 +50,21 @@ python3Packages.buildPythonApplication (finalAttrs: { make docs ''; - postInstall = lib.optionalString withPodman '' - wrapProgram $out/bin/ramalama \ - --prefix PATH : ${ - lib.makeBinPath ( - [ - llama-cpp-vulkan - podman - ] - ++ (with python3Packages; [ - huggingface-hub - mlx-lm - ]) - ) - } - ''; + postInstall = + let + binPackages = [ + llama-cpp-vulkan + ] + ++ (with python3Packages; [ + huggingface-hub + mlx-lm + ]) + ++ lib.optional withPodman podman; + in + '' + wrapProgram $out/bin/ramalama \ + --prefix PATH : ${lib.makeBinPath binPackages} + ''; pythonImportsCheck = [ "ramalama" diff --git a/pkgs/by-name/sg/sgt-puzzles/package.nix b/pkgs/by-name/sg/sgt-puzzles/package.nix index d4af4eb46e9c..6bc1e154cf20 100644 --- a/pkgs/by-name/sg/sgt-puzzles/package.nix +++ b/pkgs/by-name/sg/sgt-puzzles/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sgt-puzzles"; - version = "20260523.7ad37c6"; + version = "20260720.3c36322"; src = fetchurl { url = "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${finalAttrs.version}.tar.gz"; - hash = "sha256-Pcl8wCXrnjQ68jMpZMhWcvKiHanqk1efMbzGbjOHupc="; + hash = "sha256-z0OuMD8IXEp7TAcR4xKXVanGiev78+pVvyc9lgIiOAY="; }; sgt-puzzles-menu = fetchurl { diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index 139b02922412..df0ae0a33d14 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -5,7 +5,6 @@ nix-update-script, apple-sdk_15, versionCheckHook, - llvmPackages, }: let @@ -22,20 +21,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5tyc/yYzdV/3JTtujuj7le/14XkC7TlN/nZg7tOZsNg="; }; - nativeBuildInputs = [ - # TODO: Remove once #536365 reaches this branch - llvmPackages.lld - ]; - buildInputs = [ apple-sdk_15 ]; makeFlags = [ "arm64" ]; - # TODO: Remove once #536365 reaches this branch - env.NIX_CFLAGS_LINK = "-fuse-ld=lld"; - installPhase = '' runHook preInstall diff --git a/pkgs/by-name/sl/sleek-grub-theme/package.nix b/pkgs/by-name/sl/sleek-grub-theme/package.nix index e7ae9353fbb4..33db59ef3c61 100644 --- a/pkgs/by-name/sl/sleek-grub-theme/package.nix +++ b/pkgs/by-name/sl/sleek-grub-theme/package.nix @@ -15,13 +15,13 @@ assert builtins.elem withStyle [ stdenv.mkDerivation { pname = "sleek-grub-theme"; - version = "unstable-2024-08-11"; + version = "0-unstable-2025-05-21"; src = fetchFromGitHub { owner = "sandesh236"; repo = "sleek--themes"; - rev = "0c47e645ccc2d72aa165e9d994f9d09f58de9f6d"; - hash = "sha256-H4s4CSR8DaH8RT9w40hkguNNcC0U8gHKS2FLt+FApeA="; + rev = "e103aa4cd655be6a38dbab37b1911c6ed9ef7765"; + hash = "sha256-E3DSOZlszBRy2F172L7ZSSsDlkk3n9jGXl4hRWv2WF8="; }; installPhase = '' diff --git a/pkgs/by-name/sn/snip/package.nix b/pkgs/by-name/sn/snip/package.nix index 6091c029014a..f890bd12d9f1 100644 --- a/pkgs/by-name/sn/snip/package.nix +++ b/pkgs/by-name/sn/snip/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "snip"; - version = "0.20.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "edouard-claude"; repo = "snip"; tag = "v${finalAttrs.version}"; - hash = "sha256-u6Jc9U4tb5Y/evtWR/Nw535xVh09ChcKN0Dm+l3bjvA="; + hash = "sha256-y88ZHg29Z/QBZk8YWXp287Rel7DpPESYAlbqt5hj1nc="; }; vendorHash = "sha256-2MxFZqjNuLzcuu+bsLyOyHIakCxh7j0FUx8LsjZRhrY="; diff --git a/pkgs/by-name/st/stalwart-vandelay/package.nix b/pkgs/by-name/st/stalwart-vandelay/package.nix index 7b9e4fc45efa..5b00794ce326 100644 --- a/pkgs/by-name/st/stalwart-vandelay/package.nix +++ b/pkgs/by-name/st/stalwart-vandelay/package.nix @@ -8,14 +8,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "vandelay"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "vandelay"; tag = "v${finalAttrs.version}"; - hash = "sha256-ePOh2lJWJvZ5sV8KQ4n9A5pV7UhDBkN+RQ37LLoMm+o="; + hash = "sha256-Eg4kQncwCHpFzCZBp2OK4yUsBsYXwf1pQ+USHwmU9Ro="; }; - cargoHash = "sha256-KlAarYv8Vzp0bpR2jhC4bG0iVyG5YPGvsa8GHRsscJg="; + cargoHash = "sha256-+v0xgVliX/sDDDMCzWMVDnBDoJK9a2xaIkMJwEIO6ks="; __structuredAttrs = true; __darwinAllowLocalNetworking = true; # called `Result::unwrap()` on an `Err` value: Tls("rustls platform verifier: unexpected error: No CA certificates were loaded from the system") diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index aa06af6acefe..ad9aad2305e5 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "telegraf"; - version = "1.39.1"; + version = "1.39.2"; subPackages = [ "cmd/telegraf" ]; @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "influxdata"; repo = "telegraf"; rev = "v${finalAttrs.version}"; - hash = "sha256-B9Xy02oYSYcU0IBOZes9tof/04TLvLybOU/nLLaFORk="; + hash = "sha256-yWWjlCAc5xJh4IwszVRTGIM5DMXKHyfAHEa1jSVi/mk="; }; - vendorHash = "sha256-9o0Tt6OZnoNO8iSLYmn1SMkQmZzC19uNmfHSkEqWzmA="; + vendorHash = "sha256-j/yGDEXNOrMAq4ArMjqTxZHfvQZkjmDpZQ3LAUe8BJ0="; proxyVendor = true; ldflags = [ diff --git a/pkgs/by-name/te/temporal-ui-server/package.nix b/pkgs/by-name/te/temporal-ui-server/package.nix index 4883e941a960..6e68bf22576f 100644 --- a/pkgs/by-name/te/temporal-ui-server/package.nix +++ b/pkgs/by-name/te/temporal-ui-server/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "temporal-ui-server"; - version = "2.52.0"; + version = "2.52.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "ui-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-5WGE4igWVkWwxy5k8x+X4roDX1glaW+x67UGkoiSWwM="; + hash = "sha256-Z6lDqzDDzyHh2ZLf1paqUT9f6+ioR0qnVhX4/QFa9D0="; }; vendorHash = "sha256-E9pg16YJRDahBmiHwQY3r8kA+vBfza7KdFYqdw+qBSY="; diff --git a/pkgs/by-name/tr/trilium-desktop/package.nix b/pkgs/by-name/tr/trilium-desktop/package.nix index 822f813f1a50..b18355cac248 100644 --- a/pkgs/by-name/tr/trilium-desktop/package.nix +++ b/pkgs/by-name/tr/trilium-desktop/package.nix @@ -5,7 +5,7 @@ fetchurl, makeBinaryWrapper, # use specific electron since it has to load a compiled module - electron_41, + electron_42, autoPatchelfHook, makeDesktopItem, copyDesktopItems, @@ -15,7 +15,7 @@ let pname = "trilium-desktop"; - version = "0.103.0"; + version = "0.104.0"; triliumSource = os: arch: hash: { url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip"; @@ -26,9 +26,9 @@ let darwinSource = triliumSource "macos"; # exposed like this for update.sh - x86_64-linux.hash = "sha256-1d6nYhj83LWzglkWoOtAj6lNPkik1qXY5lVpr1iG7No="; - aarch64-linux.hash = "sha256-LQMNgj1Ml8gShlPS0qgD/a+Fw4SjvvHrw6XAcSLN7q4="; - aarch64-darwin.hash = "sha256-dMlgJgDuxZH1jnvLalmgDUMVCdWQ8AviGt86aeMbGVY="; + x86_64-linux.hash = "sha256-VVYBXjKBo5GNKrIiSjvLw3Md26NEO2Fgot2421PDr0k="; + aarch64-linux.hash = "sha256-iHFzCiqNajETgJm4jk6NdrCybM1SG9qThBwEaGJMeqM="; + aarch64-darwin.hash = "sha256-zVV7lJhl/DNDfvbyCCdTSeDvhyzQLF8pxfnr2QYKeas="; sources = { x86_64-linux = linuxSource "x64" x86_64-linux.hash; @@ -109,7 +109,7 @@ let asar pack $tmp/ $out/share/trilium/resources/app.asar rm -rf $tmp - makeWrapper ${lib.getExe electron_41} $out/bin/trilium \ + makeWrapper ${lib.getExe electron_42} $out/bin/trilium \ "''${gappsWrapperArgs[@]}" \ --set-default ELECTRON_IS_DEV 0 \ --add-flags $out/share/trilium/resources/app.asar diff --git a/pkgs/by-name/tr/trilium-server/package.nix b/pkgs/by-name/tr/trilium-server/package.nix index 02b27fca73c2..2e9e0558309a 100644 --- a/pkgs/by-name/tr/trilium-server/package.nix +++ b/pkgs/by-name/tr/trilium-server/package.nix @@ -7,12 +7,12 @@ }: let - version = "0.103.0"; + version = "0.104.0"; serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz"; - serverSource_x64.hash = "sha256-+PmlEevacif9xP8y7KrMMCwMQ0jGmT9yVhMrQ1SYG58="; + serverSource_x64.hash = "sha256-lrZL0c9ijvjYUQlN6BN1BhHR2KacFG6h6KzIlkIKLGk="; serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz"; - serverSource_arm64.hash = "sha256-RjnHCvVIR/ExZ9lC8ukGr2M8X1Hnj5ZeVMmQHUvZTKY="; + serverSource_arm64.hash = "sha256-EgqYA7IBSt9tZ12MgktIKhJ9/ww/prTCE5Z7enMUk7Q="; serverSource = if stdenv.hostPlatform.isx86_64 then diff --git a/pkgs/by-name/vf/vfkit/package.nix b/pkgs/by-name/vf/vfkit/package.nix index dbe208e8b563..0acbe47ce0cf 100644 --- a/pkgs/by-name/vf/vfkit/package.nix +++ b/pkgs/by-name/vf/vfkit/package.nix @@ -5,7 +5,6 @@ darwin, fetchFromGitHub, fetchpatch2, - llvmPackages, nix-update-script, testers, vfkit, @@ -34,17 +33,12 @@ buildGoModule rec { nativeBuildInputs = [ darwin.sigtool - # TODO: Remove this when NixOS/nixpkgs#536365 reaches master. - llvmPackages.lld ]; buildInputs = [ apple-sdk_15 ]; - # TODO: Remove this when NixOS/nixpkgs#536365 reaches master. - env.NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' llvmPackages.lld "ld64.lld"}"; - postFixup = '' codesign --entitlements vf.entitlements -f -s - $out/bin/vfkit ''; diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix index c8828798bbbb..ec8b5d38fb15 100644 --- a/pkgs/by-name/vi/vintagestory/package.nix +++ b/pkgs/by-name/vi/vintagestory/package.nix @@ -27,11 +27,11 @@ assert waylandSupport -> libxkbcommon != null; stdenv.mkDerivation (finalAttrs: { pname = "vintagestory"; - version = "1.22.3"; + version = "1.22.4"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${finalAttrs.version}.tar.gz"; - hash = "sha256-sa4Pj1DwT6W6LJCAYznmbyqPtMUTaLSNTkXS1imQp04="; + hash = "sha256-6efnjDUXMweOzN1mnkwVyQzQjs1QlFHBss1qb62Z2o0="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/xf/xfstests/package.nix b/pkgs/by-name/xf/xfstests/package.nix index 6e18aa424a10..7bb4b239f07b 100644 --- a/pkgs/by-name/xf/xfstests/package.nix +++ b/pkgs/by-name/xf/xfstests/package.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xfstests"; - version = "2026.05.17"; + version = "2026.06.21"; src = fetchzip { url = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/snapshot/xfstests-dev-v${finalAttrs.version}.tar.gz"; - hash = "sha256-vfK4PcPdd1121lcjhjP63RyS6YdFfgZ6Nsauv02b1S8="; + hash = "sha256-hngS9Hnsz9XKQ42yh6mcXHiTOzL+Zk9hRpai7e2tU0E="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/by-name/xz/xz/package.nix similarity index 98% rename from pkgs/tools/compression/xz/default.nix rename to pkgs/by-name/xz/xz/package.nix index d57a98eb4e20..371962669c56 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/by-name/xz/xz/package.nix @@ -94,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: { create 30 % smaller output than gzip and 15 % smaller output than bzip2. ''; + maintainers = with lib.maintainers; [ andrewzah ]; license = with lib.licenses; [ gpl2Plus lgpl21Plus diff --git a/pkgs/by-name/ya/yad/gettext-0.25.patch b/pkgs/by-name/ya/yad/gettext-0.25.patch deleted file mode 100644 index 02f551459ef9..000000000000 --- a/pkgs/by-name/ya/yad/gettext-0.25.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 20a4e42..921ba18 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8,9 +8,13 @@ AC_PREREQ([2.59]) - - AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_SRCDIR([src]) -+AC_CONFIG_MACRO_DIRS([m4]) - - AM_MAINTAINER_MODE - -+AM_GNU_GETTEXT_VERSION([0.25]) -+AM_GNU_GETTEXT([external]) -+ - IT_PROG_INTLTOOL([0.40.0]) - - AC_PROG_CC diff --git a/pkgs/by-name/ya/yad/package.nix b/pkgs/by-name/ya/yad/package.nix index 1eb72440e0b2..39fff868cf82 100644 --- a/pkgs/by-name/ya/yad/package.nix +++ b/pkgs/by-name/ya/yad/package.nix @@ -3,44 +3,53 @@ stdenv, fetchFromGitHub, pkg-config, - intltool, autoreconfHook, wrapGAppsHook3, + gettext, + gspell, gtk3, - hicolor-icon-theme, + gtksourceview, + libappindicator-gtk3, netpbm, + webkitgtk_4_1, }: stdenv.mkDerivation (finalAttrs: { pname = "yad"; - version = "14.1"; + version = "15.0"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-Y7bp20fkNdSgBcSV1kPEpWEP7ASwZcScVRaPauwI72M="; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-z+t4eG8yXhfs4GfLFDaaOCAxrr5MIoFD6BKF8vr59IY="; }; - # FIXME: remove when gettext is fixed - patches = [ ./gettext-0.25.patch ]; - configureFlags = [ - "--enable-icon-browser" - "--with-gtk=gtk3" "--with-rgb=${placeholder "out"}/share/yad/rgb.txt" + "--enable-html" + "--enable-tray" + "--enable-appindicator" + "--enable-spell" + "--enable-sourceview" + "--enable-deprecated" + "--enable-tools" + "--enable-icon-browser" ]; buildInputs = [ + gspell gtk3 - hicolor-icon-theme + gtksourceview + libappindicator-gtk3 + webkitgtk_4_1 ]; nativeBuildInputs = [ autoreconfHook pkg-config - intltool wrapGAppsHook3 + gettext ]; postPatch = '' @@ -51,10 +60,6 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 ${netpbm.out}/share/netpbm/misc/rgb.txt $out/share/yad/rgb.txt ''; - postAutoreconf = '' - intltoolize - ''; - meta = { homepage = "https://github.com/v1cont/yad"; description = "GUI dialog tool for shell scripts"; @@ -66,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3; mainProgram = "yad"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ RoGreat ]; platforms = with lib.platforms; linux; }; }) diff --git a/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix b/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix index 3b4a38a4b0a8..7480109f824c 100644 --- a/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "clipboard.yazi"; - version = "0-unstable-2026-07-14"; + version = "0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "XYenon"; repo = "clipboard.yazi"; - rev = "4533c7f1b16196ad32749e35344bdc82a624871b"; - hash = "sha256-lThDO1b9iq+N6x/F9fKEWlNPpgJBTfxpY2xjyZF22mM="; + rev = "d4d19ea45836f279c0b99e1d234fe5ce4a154e4b"; + hash = "sha256-fawprH1+WysMcERWdCtgWulSHo4Pmu3eLLHbnKwvkIM="; }; meta = { diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 7606b61fd07b..d88b2ba733bc 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -4,15 +4,16 @@ fetchPypi, linuxHeaders, setuptools, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "evdev"; version = "1.9.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LBQOAayEN3WPoj/lyHE5dBJGH0LUIaogJB3I/oz8y8k="; }; @@ -25,16 +26,23 @@ buildPythonPackage rec { buildInputs = [ linuxHeaders ]; - doCheck = false; - pythonImportsCheck = [ "evdev" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # tries to open /dev/uinput + "tests/test_uinput.py" + ]; + meta = { description = "Provides bindings to the generic input event interface in Linux"; homepage = "https://python-evdev.readthedocs.io/"; - changelog = "https://github.com/gvalkov/python-evdev/blob/v${version}/docs/changelog.rst"; + changelog = "https://github.com/gvalkov/python-evdev/blob/v${finalAttrs.version}/docs/changelog.rst"; license = lib.licenses.bsd3; maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/python-modules/expiring-dict/default.nix b/pkgs/development/python-modules/expiring-dict/default.nix index ce39c7151918..5da8b3aff24f 100644 --- a/pkgs/development/python-modules/expiring-dict/default.nix +++ b/pkgs/development/python-modules/expiring-dict/default.nix @@ -4,16 +4,17 @@ fetchPypi, setuptools, sortedcontainers, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "expiring-dict"; version = "1.1.2"; pyproject = true; src = fetchPypi { pname = "expiring_dict"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-yoy4AjBOrlszoj7EwZAZthCt/aUMvEyb+jrVws04djE="; }; @@ -23,10 +24,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "expiring_dict" ]; + nativeCheckInputs = [ pytestCheckHook ]; + meta = { description = "Python dict with TTL support for auto-expiring caches"; homepage = "https://github.com/dparker2/py-expiring-dict"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/extras/default.nix b/pkgs/development/python-modules/extras/default.nix index d73a0c050ea7..a7fd5bbdb958 100644 --- a/pkgs/development/python-modules/extras/default.nix +++ b/pkgs/development/python-modules/extras/default.nix @@ -2,24 +2,36 @@ lib, buildPythonPackage, fetchPypi, + setuptools, + pytestCheckHook, + testtools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "extras"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e"; + inherit (finalAttrs) pname version; + hash = "sha256-Ey423hC5yR1dTMYgFgpHbgRoqI8WyUMYF6ZylhGoG04="; }; - # error: invalid command 'test' - doCheck = false; + build-system = [ setuptools ]; + + preCheck = '' + substituteInPlace extras/tests/test_extras.py \ + --replace-fail "assertEquals(" "assertEqual(" + ''; + + nativeCheckInputs = [ + pytestCheckHook + testtools + ]; meta = { description = "Useful extra bits for Python - things that should be in the standard library"; homepage = "https://github.com/testing-cabal/extras"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/tools/godot/4.7/default.nix b/pkgs/development/tools/godot/4.7/default.nix index 81ccf416ba37..3d411ed36a14 100644 --- a/pkgs/development/tools/godot/4.7/default.nix +++ b/pkgs/development/tools/godot/4.7/default.nix @@ -1,11 +1,11 @@ { - version = "4.7-stable"; - hash = "sha256-ur9bQ6DTUxeTRqFITAgjpyoOEHgYnjEAQY3sSNNtr0c="; + version = "4.7.1-stable"; + hash = "sha256-3JzJuFbicIJ4AiEVxh5t1/q9mjxwFXZvTAfEBdrIzsc="; default = { - exportTemplatesHash = "sha256-lxRFncBxkHwPPV8X1gj69p582iEzH8XTnEUD/6Tpnuw="; + exportTemplatesHash = "sha256-hkCdtiALb4/TIwmJwtIAKFHz3Ris8R1726/d9aDdD3I="; }; mono = { - exportTemplatesHash = "sha256-TAKguZrZxbwkPC55RoYo2z34k1DZ24/JlZiPadEm4Gk="; + exportTemplatesHash = "sha256-75pwi+UezZdM19zNyv16GHDaPT4cJMByvbuYGMen22M="; nugetDeps = ./deps.json; }; } diff --git a/pkgs/os-specific/linux/tt-kmd/default.nix b/pkgs/os-specific/linux/tt-kmd/default.nix index 1e3923f6f787..ebe56b8bf6f9 100644 --- a/pkgs/os-specific/linux/tt-kmd/default.nix +++ b/pkgs/os-specific/linux/tt-kmd/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "tt-kmd"; - version = "2.7.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "tenstorrent"; repo = "tt-kmd"; tag = "ttkmd-${finalAttrs.version}"; - hash = "sha256-+4Wqj91EsPthKQXajiDd9Y77oTp9BNqCgFCQrTAp6ag="; + hash = "sha256-CMZk1q/ybrpNEr8XoCtMsV5127bYKsUXl0ZitImIaPY="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b36f9e932cf..757f07702573 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2497,8 +2497,6 @@ with pkgs; liquidctl = with python3Packages; toPythonApplication liquidctl; - xz = callPackage ../tools/compression/xz { }; - madlang = haskell.lib.compose.justStaticExecutables haskellPackages.madlang; man = man-db;