Unverified Commit 5c9b757f authored by Leona Maroni's avatar Leona Maroni
Browse files

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

parents 41228b71 3a3af266
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ jobs:
            into: staging-next-25.05
          - from: staging-next-25.05
            into: staging-25.05
          - from: master
            into: staging-next-25.11
          - from: staging-next-25.11
            into: staging-25.11
          - name: merge-base(master,staging) → haskell-updates
            from: master staging
            into: haskell-updates
+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@

- `mx-puppet-discord` was removed from Nixpkgs along with its NixOS module as it was unmaintained and was the only user of sha1 hashes in tree.

- `notary` has been removed because it was [archived upstream](https://github.com/notaryproject/.github/issues/70). Upstream recommends [`notation`](https://github.com/notaryproject/notation/) instead.

- `gradience` has been removed because it was archived upstream.

- `kbd` package's `outputs` now include a `man` and `scripts` outputs. The `unicode_start` and `unicode_stop` Bash scripts are now part of the `scripts` output, allowing most usages of the `kbd` package to not pull in `bash`.
+36 −0
Original line number Diff line number Diff line
# Nixpkgs 26.05 (2026.05/??) {#sec-nixpkgs-release-26.05}

## Highlights {#sec-nixpkgs-release-26.05-highlights}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

- Create the first release note entry in this section!

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

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

- `spoof` has been removed, as there are many issues upstream with it working on modern OS versions, and it appears to be unmaintained.

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

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

- Create the first release note entry in this section!

## Nixpkgs Library {#sec-nixpkgs-release-26.05-lib}

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

### Breaking changes {#sec-nixpkgs-release-26.05-lib-breaking}

- Create the first release note entry in this section!


### Deprecations {#sec-nixpkgs-release-26.05-lib-deprecations}

- Create the first release note entry in this section!


### Additions and Improvements {#sec-nixpkgs-release-26.05-lib-additions-improvements}

- Create the first release note entry in this section!
+24 −42
Original line number Diff line number Diff line
@@ -3232,12 +3232,6 @@
    githubId = 10439709;
    name = "Bert Moens";
  };
  berdario = {
    email = "berdario@gmail.com";
    github = "berdario";
    githubId = 752835;
    name = "Dario Bertini";
  };
  bergey = {
    email = "bergey@teallabs.org";
    github = "bergey";
@@ -3827,6 +3821,12 @@
    github = "britter";
    githubId = 1327662;
  };
  brittonr = {
    name = "Britton Robitzsch";
    email = "b@robitzs.ch";
    github = "brittonr";
    githubId = 4730485;
  };
  brodes = {
    email = "me@brod.es";
    github = "brhoades";
@@ -10119,12 +10119,6 @@
    githubId = 79340822;
    keys = [ { fingerprint = "3582 5B85 66C8 4F36 45C7  EC42 809F 7938 9CB1 8650"; } ];
  };
  havvy = {
    email = "ryan.havvy@gmail.com";
    github = "Havvy";
    githubId = 731722;
    name = "Ryan Scheel";
  };
  hawkw = {
    email = "eliza@elizas.website";
    github = "hawkw";
@@ -11417,12 +11411,6 @@
    githubId = 8095978;
    name = "j-mendez";
  };
  j03 = {
    email = "github@johannesloetzsch.de";
    github = "johannesloetzsch";
    githubId = 175537;
    name = "Johannes Lötzsch";
  };
  j0hax = {
    name = "Johannes Arnold";
    email = "johannes.arnold@stud.uni-hannover.de";
@@ -13292,12 +13280,6 @@
    githubId = 54859825;
    keys = [ { fingerprint = "B2D0 AA53 8DBE 60B0 0811  3FC0 2D52 5F67 791E 5834"; } ];
  };
  kampfschlaefer = {
    email = "arnold@arnoldarts.de";
    github = "kampfschlaefer";
    githubId = 3831860;
    name = "Arnold Krille";
  };
  kanashimia = {
    email = "chad@redpilled.dev";
    github = "kanashimia";
@@ -14526,12 +14508,6 @@
    githubId = 736291;
    name = "Lee Machin";
  };
  leenaars = {
    email = "ml.software@leenaa.rs";
    github = "leenaars";
    githubId = 4158274;
    name = "Michiel Leenaars";
  };
  legojames = {
    github = "jrobinson-uk";
    githubId = 4701504;
@@ -14769,6 +14745,18 @@
    matrix = "@libjared:matrix.org";
    name = "Jared Perry";
  };
  liferooter = {
    name = "Gleb Smirnov";
    github = "liferooter";
    githubId = 54807745;
    email = "glebsmirnov0708@gmail.com";
    matrix = "@liferooter:vanutp.dev";
    keys = [
      {
        fingerprint = "B793 3BBD DE3F 524F 69BD  CEAB FF5A EB4C 68AC 0F8D";
      }
    ];
  };
  liff = {
    email = "liff@iki.fi";
    github = "liff";
@@ -15089,6 +15077,12 @@
    github = "lorenz";
    githubId = 5228892;
  };
  LorenzBischof = {
    name = "Lorenz Bischof";
    email = "nix@lorenzbischof.ch";
    github = "LorenzBischof";
    githubId = 1837725;
  };
  lorenzleutgeb = {
    email = "lorenz@leutgeb.xyz";
    github = "lorenzleutgeb";
@@ -15662,12 +15656,6 @@
    githubId = 1433367;
    name = "Marc Fontaine";
  };
  magenbluten = {
    email = "magenbluten@codemonkey.cc";
    github = "magenbluten";
    githubId = 1140462;
    name = "magenbluten";
  };
  magicquark = {
    name = "magicquark";
    github = "magicquark";
@@ -20173,12 +20161,6 @@
    githubId = 121009904;
    name = "penalty1083";
  };
  penguwin = {
    email = "penguwin@penguwin.eu";
    github = "penguwin";
    githubId = 13225611;
    name = "Nicolas Martin";
  };
  pentane = {
    email = "cyclopentane@aidoskyneen.eu";
    github = "cyclic-pentane";
+0 −1
Original line number Diff line number Diff line
@@ -631,7 +631,6 @@ with lib.maintainers;
  mate = {
    members = [
      bobby285271
      j03
      romildo
    ];
    scope = "Maintain Mate desktop environment and related packages.";
Loading