Unverified Commit cafa6300 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 9f66caaa 41b88f48

nixos/modules/services/desktops/pipewire/pipewire.nix

+3 −0
Original line number Diff line number Diff line
@@ -369,6 +369,9 @@ in 
    systemd.user.services.pipewire.environment.LV2_PATH = mkIf (

      !cfg.systemWide

    ) "${lv2Plugins}/lib/lv2";

    systemd.user.services.filter-chain.environment.LV2_PATH = mkIf (

      !cfg.systemWide

    ) "${lv2Plugins}/lib/lv2";



    # Mask pw-pulse if it's not wanted

    systemd.services.pipewire-pulse.enable = cfg.pulse.enable && cfg.systemWide;

pkgs/by-name/co/commonsLang/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@ 
}:



stdenv.mkDerivation (finalAttrs: {

  version = "3.18.0";

  version = "3.19.0";

  pname = "commons-lang";



  src = fetchurl {

    url = "mirror://apache/commons/lang/binaries/commons-lang3-${finalAttrs.version}-bin.tar.gz";

    hash = "sha256-rdX5zWVkN1FdGcivRgWDIvm7wzdZGoEQJ/cG34TuWxQ=";

    hash = "sha256-BipGZH6z6s2GKPSdgU4UCjBhIM+o0cB9/QyXRJLIADo=";

  };



  installPhase = ''

pkgs/by-name/hm/hmcl/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -31,13 +31,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "hmcl";

  version = "3.6.17";

  version = "3.6.18";



  src = fetchurl {

    # HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key.

    # See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28

    url = "https://github.com/HMCL-dev/HMCL/releases/download/release-${finalAttrs.version}/HMCL-${finalAttrs.version}.jar";

    hash = "sha256-LNEb5YpvuMQGPy1114+y+59ZZNfBuC/Il813NkqHDMg=";

    hash = "sha256-x8UcHdBYXdnTabJh2hxsknYipYNBJW2vKxJKHhryMLQ=";

  };



  icon = fetchurl {

pkgs/development/node-packages/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ mapAliases { 
  inherit (pkgs) uglify-js; # added 2024-06-15

  inherit (pkgs) undollar; # added 2024-06-29

  inherit (pkgs) ungit; # added 2023-08-20

  unified-language-server = throw "unified-language-server was removed as it is a library that should be imported within a Javascript project, not an end-user tool"; # added 2025-10-02

  inherit (pkgs) vim-language-server; # added 2024-06-25

  vls = throw "vls has been deprecated by upstream as vetur is also deprecated. Upstream suggests migrating to Volar for Vue LSP tooling instead."; # added 2024-12-09

  inherit (pkgs) vsc-leetcode-cli; # Added 2023-08-30

pkgs/development/node-packages/node-packages.json

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ 
, "tsun"

, "ts-node"

, "ttf2eot"

, "unified-language-server"

, "vega-cli"

, "vega-lite"

, "vercel"