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

Merge master into staging-nixos

parents b74649e3 c5fd0b8a

ci/OWNERS

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ pkgs/development/interpreters/elixir/ @NixOS/beam 
pkgs/development/interpreters/lfe/      @NixOS/beam



# Authelia

pkgs/servers/authelia/ @06kellyjac @dit7ya @nicomem

pkgs/by-name/au/authelia/ @06kellyjac @dit7ya @nicomem



# OctoDNS

pkgs/by-name/oc/octodns/ @anthonyroussel

doc/release-notes/rl-2605.section.md

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ 


- `forgejo` has been updated to major version 14. For more information, see the [release blog post](https://forgejo.org/2026-01-release-v14-0/) and [full release notes](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/14.0.0.md)



- `lima` has been updated from `1.x` to `2.x`. This major update includes several breaking changes, such as `/tmp/lima` no longer being mounted by default.



- `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/.



- `gurk-rs` has been updated from `0.6.4` to `0.8.0`. Version `0.8.0` includes breaking changes. For more information read the [release notes for 0.8.0](https://github.com/boxdot/gurk-rs/releases/tag/v0.8.0).

pkgs/by-name/al/alsa-lib-with-plugins/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ let 
in

runCommand "${alsa-lib.pname}-${alsa-lib.version}"

  {

    inherit (alsa-lib) pname version;

    meta = {

      description = "Wrapper to ease access to ALSA plugins";

      mainProgram = "aserver";

pkgs/by-name/ar/archipelago/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
}:

stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "archipelago";

  version = "0.6.5";

  version = "0.6.6";

  src = fetchurl {

    url = "https://github.com/ArchipelagoMW/Archipelago/releases/download/${finalAttrs.version}/Archipelago_${finalAttrs.version}_linux-x86_64.AppImage";

    hash = "sha256-06EFpnMMz+yqqHDuUDw9AMBd0a0Ay7oVkzD4mna7XeM=";

    hash = "sha256-mJ0bPBBou3BRqEW5QierjD0ohDBQ9J0jnoV4TCf9XOM=";

  };



  dontUnpack = true;

pkgs/games/arx-libertatis/default.nix→pkgs/by-name/ar/arx-libertatis/package.nix

+3 −4
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 
  optipng,

  imagemagick,

  withCrashReporter ? !stdenv.hostPlatform.isDarwin,

  qtbase ? null,

  wrapQtAppsHook ? null,

  qt5,

  curl ? null,

  gdb ? null,

}:
@@ -49,7 +48,7 @@ stdenv.mkDerivation rec { 
    imagemagick

    optipng

  ]

  ++ optionals withCrashReporter [ wrapQtAppsHook ];

  ++ optionals withCrashReporter [ qt5.wrapQtAppsHook ];



  buildInputs = [

    zlib
@@ -62,7 +61,7 @@ stdenv.mkDerivation rec { 
    libepoxy

  ]

  ++ optionals withCrashReporter [

    qtbase

    qt5.qtbase

    curl

  ]

  ++ optionals stdenv.hostPlatform.isLinux [ gdb ];