Commit f75ba3ac authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents 7cdf0000 1cc20891
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -203,6 +203,8 @@

- `rofi-emoji-wayland` has been merged into `rofi-emoji` as `rofi` has been updated to `2.0.0` and supports both X11 & Wayland.

- The main binary of `tomlq` has been renamed from `tomlq` to `tq`.

- `emacs-macport` has been moved to a fork of Mitsuharu Yamamoto's patched source code starting with Emacs v30 as the original project seems to be currently dormant. All older versions of this package have been dropped.
  This introduces some backwards‐incompatible changes; see the NEWS for details.
  NEWS can be viewed from Emacs by typing `C-h n`, or by clicking `Help->Emacs News` from the menu bar.
@@ -212,6 +214,8 @@

- `python3Packages.pyheif` has been dropped due to lack of upstream maintenance and breakage. Use `python3Packages.pillow-heif` instead.

- `nodePackages.rimraf` has been removed, as it is a Javascript library, and packages that want to use it should depend directly on it instead.

## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+4 −4
Original line number Diff line number Diff line
@@ -172,11 +172,11 @@ in
    };

    environmentFile = lib.mkOption {
      type = with lib.types; nullOr path;
      default = null;
      type = with lib.types; coercedTo path lib.singleton (listOf path);
      default = [ ];
      example = "/var/lib/vaultwarden.env";
      description = ''
        Additional environment file as defined in {manpage}`systemd.exec(5)`.
        Additional environment file or files as defined in {manpage}`systemd.exec(5)`.

        Secrets like {env}`ADMIN_TOKEN` and {env}`SMTP_PASSWORD`
        should be passed to the service without adding them to the world-readable Nix store.
@@ -225,7 +225,7 @@ in
      serviceConfig = {
        User = user;
        Group = group;
        EnvironmentFile = [ configFile ] ++ lib.optional (cfg.environmentFile != null) cfg.environmentFile;
        EnvironmentFile = [ configFile ] ++ cfg.environmentFile;
        ExecStart = lib.getExe vaultwarden;
        LimitNOFILE = "1048576";
        CapabilityBoundingSet = [ "" ];
+4 −4
Original line number Diff line number Diff line
@@ -38,17 +38,17 @@ let
in
stdenv.mkDerivation rec {
  pname = "reaper";
  version = "7.46";
  version = "7.47";

  src = fetchurl {
    url = url_for_platform version stdenv.hostPlatform.qemuArch;
    hash =
      if stdenv.hostPlatform.isDarwin then
        "sha256-uGWeaRl01rH7+RrMoqAv85EiKJ3/qUFiQVt1zILVJTQ="
        "sha256-exVal9bXNNRaAVTz+c+cugs9TZ8GB8yyCA6jkeW8ipQ="
      else
        {
          x86_64-linux = "sha256-8XEy7IXjjw7WbPxpxFP30ivMgi0/iWbtljuYCQ2BzDI=";
          aarch64-linux = "sha256-H+lvnpaKESad0DI9l1AexFxgwPi9EidVR1Gh6oITjHQ=";
          x86_64-linux = "sha256-sbkUEGecqw5Fbl5Ev8pwlE5nMxNz8bf90d641S3cT8Y=";
          aarch64-linux = "sha256-8VNmIUa4c/cGVlegx9joD6tX1cTDBWnM2GklCINsJa0=";
        }
        .${stdenv.hostPlatform.system};
  };
+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ mapAliases (
    BufOnly = BufOnly-vim;
    calendar = calendar-vim;
    coc-rls = throw "coc-rls has been removed, as rls has been archived since 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # addedd 2025-10-01
    coc-vetur = throw "coc-vetur was removed, as vetur is unmaintained by Vue. You should switch to Volar, which supports Vue 3"; # added 2025-10-01
    coffee-script = vim-coffee-script;
    coffeeScript = vim-coffee-script; # backwards compat, added 2014-10-18
    Solarized = vim-colors-solarized;
+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ let
    "coc-texlab"
    "coc-tsserver"
    "coc-ultisnips"
    "coc-vetur"
    "coc-vimlsp"
    "coc-vimtex"
    "coc-wxml"
Loading