Unverified Commit dd51f936 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'master' into staging-next 

lixPackageSets.git conflicted via 9c29a340 + eabfa160
I think, hopefully good now.
parents 29998907 589eafc5

ci/eval/compare/maintainers.nix

+5 −5
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ let 
  anyMatchingFiles = files: builtins.any anyMatchingFile files;



  attrsWithMaintainers = lib.pipe (changedattrs ++ removedattrs) [

    (builtins.map (

    (map (

      name:

      let

        # Some packages might be reported as changed on a different platform, but
@@ -46,7 +46,7 @@ let 
  relevantFilenames =

    drv:

    (lib.lists.unique (

      builtins.map (pos: lib.strings.removePrefix (toString ../..) pos.file) (

      map (pos: lib.strings.removePrefix (toString ../..) pos.file) (

        builtins.filter (x: x != null) [

          ((drv.meta or { }).maintainersPosition or null)

          ((drv.meta or { }).teamsPosition or null)
@@ -73,7 +73,7 @@ let 
      )

    ));



  attrsWithFilenames = builtins.map (

  attrsWithFilenames = map (

    pkg: pkg // { filenames = relevantFilenames pkg.package; }

  ) attrsWithMaintainers;
@@ -81,7 +81,7 @@ let 


  listToPing = lib.concatMap (

    pkg:

    builtins.map (maintainer: {

    map (maintainer: {

      id = maintainer.githubId;

      inherit (maintainer) github;

      packageName = pkg.name;
@@ -92,7 +92,7 @@ let 
  byMaintainer = lib.groupBy (ping: toString ping.${if byName then "github" else "id"}) listToPing;



  packagesPerMaintainer = lib.attrsets.mapAttrs (

    maintainer: packages: builtins.map (pkg: pkg.packageName) packages

    maintainer: packages: map (pkg: pkg.packageName) packages

  ) byMaintainer;

in

packagesPerMaintainer

ci/eval/compare/utils.nix

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ rec { 
  */

  convertToPackagePlatformAttrs =

    packagePlatformPaths:

    builtins.filter (x: x != null) (builtins.map convertToPackagePlatformAttr packagePlatformPaths);

    builtins.filter (x: x != null) (map convertToPackagePlatformAttr packagePlatformPaths);



  /*

    Converts a list of `packagePlatformPath`s directly to a list of (unique) package names
@@ -91,7 +91,7 @@ rec { 
    let

      packagePlatformAttrs = convertToPackagePlatformAttrs (uniqueStrings packagePlatformPaths);

    in

    uniqueStrings (builtins.map (p: p.name) packagePlatformAttrs);

    uniqueStrings (map (p: p.name) packagePlatformAttrs);



  /*

    Group a list of `packagePlatformAttr`s by platforms

ci/eval/outpaths.nix

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ let 


in

tweak (

  (builtins.removeAttrs nixpkgsJobs blacklist)

  (removeAttrs nixpkgsJobs blacklist)

  // {

    nixosTests.simple = nixosJobs.tests.simple;

  }

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

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


- `stalwart-mail` since `0.13.0` "introduces a significant redesign of the MTA’s delivery and queueing subsystem". See [the upgrading announcement for the `0.13.0` release](https://github.com/stalwartlabs/stalwart/blob/89b561b5ca1c5a11f2a768b4a2cfef0f473b7a01/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x).



- `meilisearch_1_11` has been removed, as it is no longer supported.



- Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases.



- The `archipelago-minecraft` package was removed, as upstream no longer provides support for the Minecraft APWorld.

flake.nix

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 
                  )

                ];

              }

              // builtins.removeAttrs args [ "modules" ]

              // removeAttrs args [ "modules" ]

            );

        }

      );