Commit 1da88f87 authored by K900's avatar K900
Browse files

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

parents fc1b8367 27b75be2
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ let
    (lib.filter (path: lib.length path > 3))
    (map (path: lib.elemAt path 3))
    (map lib.singleton)
    # Filter out new packages
    (lib.filter (attrPath: lib.hasAttrByPath attrPath pkgs))
  ];

  # An attribute can appear in affected *and* touched
+15 −0
Original line number Diff line number Diff line
@@ -138,6 +138,21 @@ let
        ];
      };
    };
    testByNameNonExistentChanged = {
      expr = fun {
        pkgs = mockPkgs {
          packages = [ ];
        };
        # Happens when a new package was added to pkgs/by-name
        changedFiles = [ "pkgs/by-name/he/hello/sources.json" ];
        affectedAttrPaths = [ ];
      };
      expected = {
        packages = [ ];
        teams = { };
        users = { };
      };
    };
    testByNameReadmeChanged = {
      expr = fun {
        pkgs = mockPkgs {
+6 −0
Original line number Diff line number Diff line
@@ -2021,6 +2021,12 @@
    name = "Austin Lund";
    keys = [ { fingerprint = "7083 E268 4BFD 845F 2B84  9E74 B695 8918 ED23 32CE"; } ];
  };
  aporro = {
    email = "git@aporro.dev";
    github = "aporro1";
    githubId = 124402746;
    name = "Apollon Tsikas";
  };
  appleboblin = {
    email = "github@appleboblin.com";
    github = "appleboblin";
+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@

- [Drasl](https://github.com/unmojang/drasl), an alternative authentication server for Minecraft. Available as [services.drasl](#opt-services.drasl.enable).

- [tabbyAPI](https://github.com/theroyallab/tabbyAPI), the official OpenAI compatible API server for Exllama. Available as [services.tabbyapi](#opt-services.tabbyapi.enable).

## Backward Incompatibilities {#sec-release-26.05-incompatibilities}

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+3 −0
Original line number Diff line number Diff line
@@ -365,6 +365,8 @@
  ./programs/xfs_quota.nix
  ./programs/xonsh.nix
  ./programs/xppen.nix
  ./programs/xscreensaver/sonar.nix
  ./programs/xscreensaver/xscreensaver.nix
  ./programs/xss-lock.nix
  ./programs/xwayland.nix
  ./programs/yazi.nix
@@ -1771,6 +1773,7 @@
  ./services/web-apps/strfry.nix
  ./services/web-apps/suwayomi-server.nix
  ./services/web-apps/szurubooru.nix
  ./services/web-apps/tabbyapi.nix
  ./services/web-apps/trilium.nix
  ./services/web-apps/tt-rss.nix
  ./services/web-apps/tuliprox.nix
Loading