diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 6f2246688d21..a13644acfd6f 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -10,7 +10,9 @@ -- Create the first release note entry in this section! +- `pqos-wrapper` was removed + as it has been unmaintained since 2022 + and not widely used. ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes} diff --git a/lib/types.nix b/lib/types.nix index deee0135e6c4..5a42ada60d84 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -501,8 +501,8 @@ rec { }; u8 = unsign 8 256; u16 = unsign 16 65536; - # the biggest int Nix accepts is 2^63 - 1 (9223372036854775808) - # the smallest int Nix accepts is -2^63 (-9223372036854775807) + # the biggest int Nix accepts is 2^63 - 1 (9223372036854775807) + # the smallest int Nix accepts is -2^63 (-9223372036854775808) u32 = unsign 32 4294967296; # u64 = unsign 64 18446744073709551616; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5b7226d344df..01c05d7f5b7f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -28951,6 +28951,13 @@ githubId = 123554; name = "Thibaut Smith"; }; + viena = { + name = "Viena"; + email = "theviena96@gmail.com"; + github = "devnchill"; + githubId = 169875752; + keys = [ { fingerprint = "BF79 8CD0 CA25 2106 99E1 ED9E F826 F032 DDDA 5560"; } ]; + }; vieta = { email = "vieta@4d2.org"; github = "yVieta"; diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index bbbe172038d5..be3056814827 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -74,7 +74,7 @@ The pre-existing `services.ankisyncd` has been marked deprecated and will be dro - [BenchExec](https://github.com/sosy-lab/benchexec), a framework for reliable benchmarking and resource measurement, available as [programs.benchexec](#opt-programs.benchexec.enable), as well as related programs [CPU Energy Meter](https://github.com/sosy-lab/cpu-energy-meter), available as [programs.cpu-energy-meter](#opt-programs.cpu-energy-meter.enable), and - [PQoS Wrapper](https://gitlab.com/sosy-lab/software/pqos-wrapper), available as [programs.pqos-wrapper](#opt-programs.pqos-wrapper.enable). + [PQoS Wrapper](https://gitlab.com/sosy-lab/software/pqos-wrapper), available as `programs.pqos-wrapper`. - [Bluemap](https://bluemap.bluecolored.de/), a 3D minecraft map renderer. Available as [services.bluemap](#opt-services.bluemap.enable). diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index c017279d73b5..3d53f1f20930 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -16,7 +16,12 @@ -- Create the first release note entry in this section! +- `programs.pqos-wrapper` module has been deleted + as the corresponding package has been dropped from nixpkgs. + +- `programs.benchexec.enable = true` + no longer sets `programs.pqos-wrapper.enable = true` + as the corresponding module has been deleted. ## Other Notable Changes {#sec-release-26.11-notable-changes} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7699a60b6ac3..b9bf52b0068a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -296,7 +296,6 @@ ./programs/pay-respects.nix ./programs/plotinus.nix ./programs/pmount.nix - ./programs/pqos-wrapper.nix ./programs/projecteur.nix ./programs/proxychains.nix ./programs/pulseview.nix diff --git a/nixos/modules/programs/benchexec.nix b/nixos/modules/programs/benchexec.nix index 322da3450f92..e60f657e4788 100644 --- a/nixos/modules/programs/benchexec.nix +++ b/nixos/modules/programs/benchexec.nix @@ -85,7 +85,6 @@ in # See . programs = { cpu-energy-meter.enable = lib.mkDefault true; - pqos-wrapper.enable = lib.mkDefault true; }; # See . diff --git a/nixos/modules/programs/pqos-wrapper.nix b/nixos/modules/programs/pqos-wrapper.nix deleted file mode 100644 index 06fe81c0b1b2..000000000000 --- a/nixos/modules/programs/pqos-wrapper.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.programs.pqos-wrapper; -in -{ - options.programs.pqos-wrapper = { - enable = lib.mkEnableOption "PQoS Wrapper for BenchExec"; - package = lib.mkPackageOption pkgs "pqos-wrapper" { }; - }; - - config = lib.mkIf cfg.enable { - hardware.cpu.x86.msr.enable = true; - - security.wrappers.${cfg.package.meta.mainProgram} = { - owner = "nobody"; - group = config.hardware.cpu.x86.msr.group; - source = lib.getExe cfg.package; - capabilities = "cap_sys_rawio=eip"; - }; - }; - - meta.maintainers = with lib.maintainers; [ lorenzleutgeb ]; -} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index a66a9bd5b929..5dbd2a2d09f2 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -82,6 +82,10 @@ in "programs" "gnome-documents" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ + "programs" + "pqos-wrapper" + ] "The corresponding package was removed from nixpkgs.") # added 2026-05-13 (mkRemovedOptionModule [ "services" diff --git a/nixos/tests/zoom-us.nix b/nixos/tests/zoom-us.nix index bc9961cf5a86..a8a6a3f2f9ea 100644 --- a/nixos/tests/zoom-us.nix +++ b/nixos/tests/zoom-us.nix @@ -14,5 +14,7 @@ machine.wait_for_x() machine.execute("zoom >&2 &") machine.wait_for_window("Zoom Workplace") + machine.sleep(20) + machine.wait_for_window("Zoom Workplace") ''; } diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix index a5b1153baeb7..c242aa12aa73 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/package.nix +++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix @@ -24,6 +24,7 @@ gamescope, mangohud, vkbasalt-cli, + vulkan-tools, vmtouch, libportal, nix-update-script, @@ -103,6 +104,7 @@ python3Packages.buildPythonApplication (finalAttrs: { xdpyinfo imagemagick vkbasalt-cli + vulkan-tools gamemode gamescope diff --git a/pkgs/by-name/cr/crossmacro/package.nix b/pkgs/by-name/cr/crossmacro/package.nix index 7aebef90e69d..57037dfba893 100644 --- a/pkgs/by-name/cr/crossmacro/package.nix +++ b/pkgs/by-name/cr/crossmacro/package.nix @@ -17,7 +17,6 @@ libxrandr, libxtst, libglvnd, - mesa, wayland, libxkbcommon, glib, @@ -68,7 +67,6 @@ buildDotnetModule rec { libxtst glib libglvnd - mesa wayland libxkbcommon ]; diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 1c382f5a9d9e..0efdeb47fcdc 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -9,6 +9,7 @@ protobuf, installShellFiles, makeBinaryWrapper, + versionCheckHook, librusty_v8 ? callPackage ./rusty-v8 { }, libffi, sqlite, @@ -237,12 +238,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; doInstallCheck = canExecute; - installCheckPhase = lib.optionalString canExecute '' - runHook preInstallCheck - $out/bin/deno --help - $out/bin/deno --version | grep "deno ${finalAttrs.version}" - runHook postInstallCheck - ''; + nativeInstallCheckInputs = [ versionCheckHook ]; passthru = { updateScript = ./update.sh; @@ -283,6 +279,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ofalvai mynacol ]; + maxSilent = 14400; # 4h, double the default of 7200s; sometimes needed for x86_64-darwin on hydra platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/by-name/de/deno/rusty-v8/default.nix b/pkgs/by-name/de/deno/rusty-v8/default.nix index 2db5c12778ed..b58fd23d14fc 100644 --- a/pkgs/by-name/de/deno/rusty-v8/default.nix +++ b/pkgs/by-name/de/deno/rusty-v8/default.nix @@ -190,6 +190,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/denoland/rusty_v8"; license = lib.licenses.mit; maintainers = deno.meta.maintainers; + maxSilent = 14400; # 4h, double the default of 7200s; sometimes needed for x86_64-darwin on hydra platforms = deno.meta.platforms; }; }) diff --git a/pkgs/by-name/de/deno/tests/default.nix b/pkgs/by-name/de/deno/tests/default.nix index c28490ee0d00..1cd80b77a389 100644 --- a/pkgs/by-name/de/deno/tests/default.nix +++ b/pkgs/by-name/de/deno/tests/default.nix @@ -71,9 +71,3 @@ in dir = ./read-file; }; }) -// { - version = testers.testVersion { - package = deno; - command = "deno --version"; - }; -} diff --git a/pkgs/by-name/dt/dtop/package.nix b/pkgs/by-name/dt/dtop/package.nix index bac5038f5d08..1cc6abf3a689 100644 --- a/pkgs/by-name/dt/dtop/package.nix +++ b/pkgs/by-name/dt/dtop/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dtop"; - version = "0.7.4"; + version = "0.7.6"; src = fetchFromGitHub { owner = "amir20"; repo = "dtop"; tag = "v${finalAttrs.version}"; - hash = "sha256-xye3P8fi/Z1RJrkkZWZuA6/UXFDGsn7pV18hMkdHTOk="; + hash = "sha256-v4LG0k9eMZiFYmIecHXwQqrTINaMAiqPYiXYEuQxx2A="; }; - cargoHash = "sha256-c/xIQ3rDvR3VbTg0iPmFAN3pRXHWzlFG6wrcsc4rCyI="; + cargoHash = "sha256-4F5eCt8AaVtGJRe7uBMHqdM3g1mLlWDXIpZCojRUjjc="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix index 8f77829a7ea9..a52e647349d6 100644 --- a/pkgs/by-name/en/envision-unwrapped/package.nix +++ b/pkgs/by-name/en/envision-unwrapped/package.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { + broken = true; description = "UI for building, configuring and running Monado, the open source OpenXR runtime"; homepage = "https://gitlab.com/gabmus/envision"; license = lib.licenses.agpl3Only; @@ -110,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { # envision (wrapped) requires frequent updates to the dependency list; # the more people that can help with this, the better. maintainers = with lib.maintainers; [ - pandapip1 + coolGi Scrumplex txkyel ]; diff --git a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix index 738cbd6267a1..014ddae292ea 100644 --- a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix +++ b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "fzf-zsh-plugin"; - version = "1.0.0-unstable-2026-03-03"; + version = "1.0.0-unstable-2026-05-06"; src = fetchFromGitHub { owner = "unixorn"; repo = "fzf-zsh-plugin"; - rev = "d56d2387ce376f80e42c46654a9ee1f899a40b46"; - hash = "sha256-twry9z9gDvRfH3AOWEV/a9HX4pnlMJDSw74Sm/MBwIk="; + rev = "87d14584a9fe82e316173fdade8761dd53e45a62"; + hash = "sha256-ne/xNgKcESsZKIBk/5TqiDDcOWUR/512DezCNVnAWzw="; }; strictDeps = true; diff --git a/pkgs/by-name/pi/picocrypt-ng/package.nix b/pkgs/by-name/pi/picocrypt-ng/package.nix index 1cce6a166ae4..db87aefd62e9 100644 --- a/pkgs/by-name/pi/picocrypt-ng/package.nix +++ b/pkgs/by-name/pi/picocrypt-ng/package.nix @@ -16,18 +16,18 @@ buildGoModule (finalAttrs: { pname = "picocrypt-ng"; - version = "2.08"; + version = "2.09"; src = fetchFromGitHub { owner = "Picocrypt-NG"; repo = "Picocrypt-NG"; tag = finalAttrs.version; - hash = "sha256-dXIJTpoupfmHtxhnqroQaxrcTsW07G4zxSib1vs1DaA="; + hash = "sha256-s+93NoJ1O6/Af33pUobSA0kAhpw7W0IdA9H6CVxShQY="; }; sourceRoot = "${finalAttrs.src.name}/src"; - vendorHash = "sha256-qluJIsd7g2UNYQwsDW7ugVzh5Z0xJkHe6OlMt04d/cc="; + vendorHash = "sha256-2c8Q7+97jSGo8lwWOYBg76K04+TFXG1DdQzVMR8G7ik="; ldflags = [ "-s" diff --git a/pkgs/by-name/pq/pqos-wrapper/package.nix b/pkgs/by-name/pq/pqos-wrapper/package.nix deleted file mode 100644 index e0a175023de5..000000000000 --- a/pkgs/by-name/pq/pqos-wrapper/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - intel-cmt-cat, - fetchFromGitLab, - python3, -}: -python3.pkgs.buildPythonApplication { - pname = "pqos-wrapper"; - version = "unstable-2022-01-31"; - pyproject = true; - - src = fetchFromGitLab { - group = "sosy-lab"; - owner = "software"; - repo = "pqos-wrapper"; - rev = "ce816497a07dcb4b931652b98359e4601a292b15"; - hash = "sha256-SaYr6lVucpJjVtGgxRbDGYbOoBwdfEDVKtvD+M1L0o4="; - }; - - build-system = with python3.pkgs; [ setuptools ]; - - makeWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ intel-cmt-cat ]}" ]; - - pythonImportsCheck = [ "pqos_wrapper" ]; - - meta = { - description = "Wrapper for Intel PQoS for the purpose of using it in BenchExec"; - homepage = "https://gitlab.com/sosy-lab/software/pqos-wrapper"; - maintainers = with lib.maintainers; [ lorenzleutgeb ]; - license = lib.licenses.asl20; - platforms = [ "x86_64-linux" ]; - mainProgram = "pqos_wrapper"; - }; -} diff --git a/pkgs/by-name/sd/SDL2_mixer/package.nix b/pkgs/by-name/sd/SDL2_mixer/package.nix index a20d57de202c..f272e58b1e8d 100644 --- a/pkgs/by-name/sd/SDL2_mixer/package.nix +++ b/pkgs/by-name/sd/SDL2_mixer/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2_mixer"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL_mixer"; rev = "release-${finalAttrs.version}"; - hash = "sha256-6HOTLwGi2oSQChwHE/oNHfZpcMh8xTuwNQSpKS01bwI="; + hash = "sha256-ln2RncnKbHIqvFia/ZlnbOGoVDJV8gF3538Wft3/wrw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/th/thunderkittens/package.nix b/pkgs/by-name/th/thunderkittens/package.nix index 7af43b80cf24..848f02691c90 100644 --- a/pkgs/by-name/th/thunderkittens/package.nix +++ b/pkgs/by-name/th/thunderkittens/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation { pname = "thunderkittens"; - version = "0-unstable-2026-04-29"; + version = "0-unstable-2026-05-11"; __structuredAttrs = true; strictDeps = true; @@ -15,8 +15,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "HazyResearch"; repo = "ThunderKittens"; - rev = "4b0aa30da67ba4466c2079695183f428fd6ce0bf"; - hash = "sha256-AxIs8FmEtLy/9J1oslbqwnl/KiNS55FZ4lOz/1EAmd4="; + rev = "41f4c2a7e4246911e4ed2b7ced8ea13bfd295e7f"; + hash = "sha256-dGvfoi4JMrog8ao0/O1Lrsp/Jzf6Bh+Fch10wlokjAo="; }; dontBuild = true; diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix index 0bd5f57a54dc..029119029240 100644 --- a/pkgs/by-name/un/unityhub/package.nix +++ b/pkgs/by-name/un/unityhub/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.16.4"; + version = "3.18.0"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/UnityHubSetup-${version}-amd64.deb"; - hash = "sha256-cWE3F4o/VWTewmVrd+VKaHSv84+UlADcm1kFow/pz2Q="; + hash = "sha256-JDkmF8ANvW0j5L+92prUcVFqDbUGXkxxUZPjtOqwDlk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 857054812c2a..e30dc76a2499 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -178,6 +178,9 @@ stdenv.mkDerivation (finalAttrs: { "InstantMessaging" "Chat" ]; + mimeTypes = [ + "x-scheme-handler/discord" + ]; }); passthru = { diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index d811819729b7..916792aec826 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -135,7 +135,6 @@ let dontPatchELF = true; passthru.updateScript = ./update.sh; - passthru.tests.startwindow = callPackage ./test.nix { }; passthru.tests.nixos-module = nixosTests.zoom-us; meta = { @@ -179,7 +178,6 @@ let pkgs.libxi pkgs.libxkbcommon pkgs.libxslt - pkgs.mesa pkgs.mesa-demos pkgs.nspr pkgs.nss diff --git a/pkgs/by-name/zo/zoom-us/test.nix b/pkgs/by-name/zo/zoom-us/test.nix deleted file mode 100644 index 57cc2047312f..000000000000 --- a/pkgs/by-name/zo/zoom-us/test.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - xvfb-run, - zoom-us, - runCommand, - writeShellApplication, - xwininfo, -}: - -let - testScript = writeShellApplication { - name = "zoom-us-test-script"; - runtimeInputs = [ - xwininfo - zoom-us - ]; - text = '' - function is_zoom_window_present { - echo - xwininfo -root -tree \ - | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d' \ - | tee window-names - grep -q "Zoom Workplace" window-names - } - # Don't let zoom eat all RAM, like it did, cf. - # https://github.com/NixOS/nixpkgs/issues/371488 - prlimit --{as,data}=$((4*2**30)):$((4*2**30)) zoom-us & - for _ in {0..900} ; do - if is_zoom_window_present ; then - break - fi - sleep 1 - done - # If libraries are missing, the window still appears, - # but then disappears again immediately; check for that also. - sleep 20 - is_zoom_window_present - ''; - }; -in -runCommand "zoom-us-test" { buildInputs = [ xvfb-run ]; } '' - HOME=$PWD xvfb-run ${lib.getExe testScript} - touch ${placeholder "out"} -'' diff --git a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix index ceefafab68ef..b3acca9c375e 100644 --- a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix @@ -19,13 +19,14 @@ buildPythonPackage (finalAttrs: { pname = "jupyter-server-ydoc"; - version = "2.3.0"; + version = "2.4.0"; pyproject = true; + __structuredAttrs = true; src = fetchPypi { pname = "jupyter_server_ydoc"; inherit (finalAttrs) version; - hash = "sha256-NvMRSR6fKJ9GH83yavubcs3w6sPO7QwMvI7EOvyO/rw="; + hash = "sha256-dGMfR6Vdna333JGNeKCD/q7MbDavTS/N8mwO42v3A3I="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index 9c57c47d9c96..f041ec23b306 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -105,14 +105,13 @@ buildPythonPackage rec { "test_authorized_requests" # Fails under load on Hydra; kernel stays in 'starting' state due to a zmq socket error "test_cull_connected" + "test_execution_state" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # attempts to use trashcan, build env doesn't allow this "test_delete" # Insufficient access privileges for operation "test_regression_is_hidden" - # Fails under load (which causes failure on Hydra) - "test_execution_state" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # Failed: DID NOT RAISE diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix index 5100bdfc2e02..250c815a24b0 100644 --- a/pkgs/development/web/playwright/webkit.nix +++ b/pkgs/development/web/playwright/webkit.nix @@ -41,7 +41,6 @@ libxkbcommon, libxml2_13, libxslt, - mesa, libgbm, sqlite, systemdLibs, @@ -187,16 +186,7 @@ let wrapProgram $out/minibrowser-wpe/bin/MiniBrowser \ --prefix GIO_EXTRA_MODULES ":" "${glib-networking}/lib/gio/modules/" \ - --prefix LD_LIBRARY_PATH ":" $out/minibrowser-wpe/lib \ - --run ' - # Use Mesa as EGL vendor fallback when no system EGL vendor is configured. - # libglvnd discovers vendors via JSON files https://github.com/NVIDIA/libglvnd/blob/master/src/EGL/icd_enumeration.md - if [ -z "$__EGL_VENDOR_LIBRARY_DIRS" ] && [ -z "$__EGL_VENDOR_LIBRARY_FILENAMES" ] && \ - ! [ -d /usr/share/glvnd/egl_vendor.d ] && ! [ -d /etc/glvnd/egl_vendor.d ] && \ - ! [ -d /run/opengl-driver/share/glvnd/egl_vendor.d ]; then - export __EGL_VENDOR_LIBRARY_FILENAMES="${mesa}/share/glvnd/egl_vendor.d/50_mesa.json" - fi - ' + --prefix LD_LIBRARY_PATH ":" $out/minibrowser-wpe/lib ''; }; webkit-darwin = fetchzip { diff --git a/pkgs/kde/misc/kio-extras-kf5/default.nix b/pkgs/kde/misc/kio-extras-kf5/default.nix index 9a08af3eb75c..9686c3fa5c44 100644 --- a/pkgs/kde/misc/kio-extras-kf5/default.nix +++ b/pkgs/kde/misc/kio-extras-kf5/default.nix @@ -34,6 +34,12 @@ stdenv.mkDerivation rec { libsForQt5.wrapQtAppsHook ]; + # override ECM defaults that assume Qt6 + # this can't be cmakeFlags because we need this to be set last so it wins + preConfigure = '' + appendToVar cmakeFlags "-DKDE_INSTALL_LOGGINGCATEGORIESDIR=${placeholder "out"}/share/qlogging-categories5" + ''; + buildInputs = with libsForQt5; with libsForQt5.__internalKF5; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 2ee755b02d98..3c3f1cab4fc6 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -379,6 +379,13 @@ in tag = "v${version}"; hash = "sha256-TuWPw6sk61k7GnHwN2zH6x6mGurTHiA9f0E6NJfMa6g="; }; + meta = { + homepage = "https://github.com/egel/tmux-gruvbox"; + description = "Gruvbox colorscheme for Tmux"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ viena ]; + }; }; harpoon = mkTmuxPlugin { diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 8052d58a8eb3..c23c0c3acc4a 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -131,6 +131,8 @@ lib.makeExtensible (self: { xcode_26_4_Apple_silicon = requireXcode "26.4_Apple_silicon" "sha256-urkJVqUY6+5z0YiEqCru9M/OneDLAMzdGfOt7i3d1WI="; xcode_26_4_1 = requireXcode "26.4.1_Universal" "sha256-N9QgPKfZV64gJPlr4r/0gPS0yAgJd3a+qlr0YbzMCU4="; xcode_26_4_1_Apple_silicon = requireXcode "26.4.1_Apple_silicon" "sha256-8MtGX97e/2+zvY2Et9Jm9eXqVmyr+U02UqsKmffh9hs="; + xcode_26_5 = requireXcode "26.5_Universal" "sha256-hQ1I7CuVOmkCcVLo1AUV25PJGL33fT3MuWR+DJZ84aQ="; + xcode_26_5_Apple_silicon = requireXcode "26.5_Apple_silicon" "sha256-lavdscO0z4Tyf22vV8QMooOt5yYFwnTi1oe3yA+wTdA="; xcode = self."xcode_${ lib.replaceStrings [ "." ] [ "_" ] ( diff --git a/pkgs/servers/kanidm/1_10.nix b/pkgs/servers/kanidm/1_10.nix index ed8ea725f51e..46c641343e7a 100644 --- a/pkgs/servers/kanidm/1_10.nix +++ b/pkgs/servers/kanidm/1_10.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "1.10.1"; - hash = "sha256-nIuxaYuVVNzQpnFRisyLkWFz7GWaJOUrj8mRRcGs2KI="; - cargoHash = "sha256-zti+7dlaU9k2EQfLQmdCL7Am9Xib1YKdUFVrLx15cCc="; + version = "1.10.2"; + hash = "sha256-VkFsJPP3oGy307d7E0h9wanZC2EsXziy5XC10/6aoTI="; + cargoHash = "sha256-ureHJ5I8emHsltpe8PuzWUSQjokbXZQ7Kh0e2eTz0LE="; } diff --git a/pkgs/servers/kanidm/1_9.nix b/pkgs/servers/kanidm/1_9.nix index 1e3c888071e3..12a749448345 100644 --- a/pkgs/servers/kanidm/1_9.nix +++ b/pkgs/servers/kanidm/1_9.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "1.9.3"; - hash = "sha256-YI2nShQhsCd1vn7S4VeCELfcU0HsmZrFs60kllJJFAo="; - cargoHash = "sha256-b6kBDA/CDJHbybfvbRRZ++q9H+SVRu0BmgkwzN2i/YU="; + version = "1.9.4"; + hash = "sha256-sz4jbnaRU+mUCBwxODMGkKnk9DMAmD6cyPyCbYp6aOQ="; + cargoHash = "sha256-1U262qRtYzRTQZLNF027LlCASCvbxmuBvZJpDPnI/vU="; eolDate = "2026-05-31"; } diff --git a/pkgs/shells/fish/plugins/ai.nix b/pkgs/shells/fish/plugins/ai.nix new file mode 100644 index 000000000000..f63d13ed9af6 --- /dev/null +++ b/pkgs/shells/fish/plugins/ai.nix @@ -0,0 +1,23 @@ +{ + lib, + buildFishPlugin, + fetchFromGitHub, +}: +buildFishPlugin { + pname = "ai"; + version = "0-unstable-2025-02-14"; + + src = fetchFromGitHub { + owner = "derekstavis"; + repo = "fish-ai"; + rev = "b22952232fbf71287c56c8a09c8be2f938d33b51"; + sha256 = "sha256-ogkbNX+e5qaEbW+iO3na8JC2Xfk/9BndXRm2AcHyOmc="; + }; + + meta = { + description = "Don't remember the command, use AI to figure out"; + homepage = "https://github.com/derekstavis/fish-ai"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ theobori ]; + }; +} diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index 0620be997416..cc62f7e0adff 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -8,6 +8,8 @@ lib.makeScope newScope ( self: with self; { + ai = callPackage ./ai.nix { }; + async-prompt = callPackage ./async-prompt.nix { }; autopair = callPackage ./autopair.nix { }; diff --git a/pkgs/tools/misc/tdarr/common.nix b/pkgs/tools/misc/tdarr/common.nix index 6c52ebb084f9..0e1c893ab045 100644 --- a/pkgs/tools/misc/tdarr/common.nix +++ b/pkgs/tools/misc/tdarr/common.nix @@ -14,7 +14,6 @@ libayatana-appindicator, wayland, libxkbcommon, - mesa, libxcb, leptonica, glib, @@ -122,7 +121,6 @@ stdenv.mkDerivation (finalAttrs: { wayland libxkbcommon libxcb - mesa tesseract4 leptonica glib diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e10b345d4c8b..08ecd297c162 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1727,6 +1727,7 @@ mapAliases { pot = throw "'pot' has been removed as it requires libsoup 2.4 which is EOL"; # Added 2025-10-09 powerdns = throw "'powerdns' has been renamed to/replaced by 'pdns'"; # Converted to throw 2025-10-27 powwow = throw "'powwow' has been removed, since it's unmaintained since 2021 and doesn't build with glibc 2.42"; # Added 2025-09-28 + pqos-wrapper = throw "'pqos-wrapper' has been removed, since it's unmaintained since 2022 and archived upstream"; # Added 2026-05-13 prboom-plus = throw "'prboom-plus' has been removed since it is unmaintained upstream."; # Added 2025-09-14 preload = throw "'preload' has been removed due to lack of usage and being broken since its introduction into nixpkgs"; # Added 2025-11-29 premid = throw "'premid' has been removed, as it has been archived upstream since July 2024. Consider using the browser extension instead."; # Added 2026-04-04 diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index b508524c4d61..5010f2658c7e 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -164,6 +164,8 @@ makeScopeWithSplicing' { xcode_26_4_Apple_silicon xcode_26_4_1 xcode_26_4_1_Apple_silicon + xcode_26_5 + xcode_26_5_Apple_silicon xcode requireXcode ;