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

Merge master into staging-next

parents 706797e8 ee713e84

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -21609,6 +21609,12 @@ 
    githubId = 529649;

    name = "Raffael Mancini";

  };

  sepiabrown = {

    email = "bboxone@gmail.com";

    github = "sepiabrown";

    githubId = 35622998;

    name = "Suwon Park";

  };

  seppeljordan = {

    email = "sebastian.jordan.mail@googlemail.com";

    github = "seppeljordan";

nixos/modules/programs/streamcontroller.nix

+8 −1
Original line number Diff line number Diff line
@@ -10,7 +10,14 @@ in 
{

  options.programs.streamcontroller = {

    enable = lib.mkEnableOption "StreamController";

    package = lib.mkPackageOption pkgs "streamcontroller" { default = [ "streamcontroller" ]; };

    package = lib.mkOption {

      default = pkgs.streamcontroller.override { isKde = config.services.desktopManager.plasma6.enable; };

      defaultText = lib.literalExpression "pkgs.streamcontroller";

      type = lib.types.package;

      description = ''

        The StreamController package to use

      '';

    };

  };



  config = lib.mkIf cfg.enable {

nixos/modules/services/misc/homepage-dashboard.nix

+3 −1
Original line number Diff line number Diff line
@@ -255,12 +255,14 @@ in 
          Restart = "on-failure";

        };



        enableStrictShellChecks = true;



        preStart = ''

          # Related:

          # * https://github.com/NixOS/nixpkgs/issues/346016 ("homepage-dashboard: cache dir is not cleared upon version upgrade")

          # * https://github.com/gethomepage/homepage/discussions/4560 ("homepage NixOS package does not clear cache on upgrade leaving broken state")

          # * https://github.com/vercel/next.js/discussions/58864 ("Feature Request: Allow configuration of cache dir")

          rm -rf "$NIXPKGS_HOMEPAGE_CACHE_DIR"/*

          rm -rf "''${NIXPKGS_HOMEPAGE_CACHE_DIR:?}"/*

        '';

      };

nixos/modules/services/networking/iscsi/target.nix

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ in 
      mode = "0600";

    };



    environment.systemPackages = with pkgs; [ targetcli ];

    environment.systemPackages = with pkgs; [ targetcli-fb ];



    boot.kernelModules = [

      "configfs"
@@ -52,8 +52,8 @@ in 
      wantedBy = [ "multi-user.target" ];

      serviceConfig = {

        Type = "oneshot";

        ExecStart = "${pkgs.python3.pkgs.rtslib}/bin/targetctl restore";

        ExecStop = "${pkgs.python3.pkgs.rtslib}/bin/targetctl clear";

        ExecStart = "${lib.getExe pkgs.python3Packages.rtslib-fb} restore";

        ExecStop = "${lib.getExe pkgs.python3Packages.rtslib-fb} clear";

        RemainAfterExit = "yes";

      };

    };

pkgs/applications/editors/emacs/make-emacs.nix

+4 −7
Original line number Diff line number Diff line
@@ -460,13 +460,10 @@ mkDerivation (finalAttrs: { 
      NATIVE_FULL_AOT = "1";

      LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths;

    }

    // {

      NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [

    // lib.optionalAttrs (variant == "macport") {

      # Fixes intermittent segfaults when compiled with LLVM >= 7.0.

      # See https://github.com/NixOS/nixpkgs/issues/127902

        (lib.optionalString (variant == "macport") "-include ${./macport_noescape_noop.h}")

        (lib.optionalString stdenv.hostPlatform.isDarwin "-DFD_SETSIZE=10000 -DDARWIN_UNLIMITED_SELECT")

      ];

      NIX_CFLAGS_COMPILE = "-include ${./macport_noescape_noop.h}";

    };



  enableParallelBuilding = true;