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

Merge master into staging-next

parents c9485e72 da72f822
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -1321,6 +1321,12 @@
    githubId = 5892756;
    name = "Alec Snyder";
  };
  allout58 = {
    email = "jamesthollowell@gmail.com";
    github = "allout58";
    githubId = 2939703;
    name = "James Hollowell";
  };
  allusive = {
    email = "jasper@allusive.dev";
    name = "Allusive";
@@ -7129,6 +7135,13 @@
    github = "dvcorreia";
    githubId = 20357938;
  };
  dvdznf = {
    name = "David Zanfir";
    github = "Dvd-Znf";
    githubId = 101937630;
    email = "email@dvdznf.xyz";
    matrix = "@dvdznf:gitter.im";
  };
  dvn0 = {
    email = "git@dvn.me";
    github = "dvn0";
+38 −12
Original line number Diff line number Diff line
{ maintainer }:
{
  maintainer, # --argstr
  short ? false, # use --arg short true
  extra ? "", # --argstr
}:
let
  pkgs = import ./../../default.nix {
    config.allowAliases = false;
@@ -30,7 +34,7 @@ let
      ) set
    ));

  packages = packagesWith (
  packages = builtins.trace "evaluating list of packages for maintainer: ${maintainer}" packagesWith (
    name: pkg:
    (
      if builtins.hasAttr "meta" pkg && builtins.hasAttr "maintainers" pkg.meta then
@@ -46,23 +50,45 @@ let
  ) (name: name) "" pkgs;

in
pkgs.stdenv.mkDerivation {
  name = "nixpkgs-update-script";
pkgs.stdenvNoCC.mkDerivation {
  name = "check-hydra-by-maintainer";
  buildInputs = [ pkgs.hydra-check ];
  buildCommand = ''
    echo ""
    echo "----------------------------------------------------------------"
    echo ""
    echo "nix-shell maintainers/scripts/check-hydra-by-maintainer.nix --argstr maintainer SuperSandro2000"
    echo "nix-shell maintainers/scripts/check-hydra-by-maintainer.nix --argstr maintainer yourname"
    echo ""
    echo "nix-shell maintainers/scripts/check-hydra-by-maintainer.nix --argstr maintainer yourname --arg short true"
    echo ""
    echo "nix-shell maintainers/scripts/check-hydra-by-maintainer.nix --argstr maintainer yourname --argstr extra \"--json\""
    echo ""
    echo "----------------------------------------------------------------"
    exit 1
  '';
  shellHook = ''
    unset shellHook # do not contaminate nested shells
  shellHook =
    let
      # trying to only add spaces as necessary for optional args
      # with optStr don't need spaces between nix templating
      optStr = cond: string: lib.optionalString cond "${string} ";
      args = [
        "hydra-check"
      ]
      ++ (lib.optional short "--short")
      ++ (lib.optional (extra != "") extra)
      ++ (map lib.escapeShellArg packages);
      command = lib.concatStringsSep " " args;
    in
    ''
      # if user presses ctrl-c during run
      # pass on ctrl-c to fully quit rather than exiting to nix-shell
      function ctrl_c() {
        exit 130
      }
      trap ctrl_c INT
      echo "Please stand by"
    echo nix-shell -p hydra-check --run "hydra-check ${builtins.concatStringsSep " " packages}"
    nix-shell -p hydra-check --run "hydra-check ${builtins.concatStringsSep " " packages}"
      echo "${command}"
      ${command}
      exit $?
    '';
}
+2 −0
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@

- [nixbit](https://github.com/pbek/nixbit), a GUI application for updating your NixOS system from a Nix Flakes Git repository. Available as [programs.nixbit](#opt-programs.nixbit.enable).

- [ErsatzTV](https://ersatztv.org), a personal IPTV server. Available as [services.ersatztv](#opt-services.ersatztv.enable)

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

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+1 −0
Original line number Diff line number Diff line
@@ -833,6 +833,7 @@
  ./services/misc/dwm-status.nix
  ./services/misc/dysnomia.nix
  ./services/misc/errbot.nix
  ./services/misc/ersatztv.nix
  ./services/misc/etebase-server.nix
  ./services/misc/etesync-dav.nix
  ./services/misc/evdevremapkeys.nix
+2 −1
Original line number Diff line number Diff line
@@ -265,7 +265,8 @@ in
        ++ (with pkgs.pantheon; [
          elementary-files
          elementary-settings-daemon
          xdg-desktop-portal-pantheon
          # https://github.com/elementary/portals/issues/157
          # xdg-desktop-portal-pantheon
        ])
      ) config.environment.pantheon.excludePackages;

Loading