Unverified Commit 85f6f759 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into haskell-updates

parents a09e41ed 231e60ee

lib/customisation.nix

+17 −0
Original line number Diff line number Diff line
@@ -343,7 +343,24 @@ rec { 
    , newScope

    }:

    { otherSplices

    # Attrs from `self` which won't be spliced.

    # Avoid using keep, it's only used for a python hook workaround, added in PR #104201.

    # ex: `keep = (self: { inherit (self) aAttr; })`

    , keep ? (_self: {})

    # Additional attrs to add to the sets `callPackage`.

    # When the package is from a subset (but not a subset within a package IS #211340)

    # within `spliced0` it will be spliced.

    # When using an package outside the set but it's available from `pkgs`, use the package from `pkgs.__splicedPackages`.

    # If the package is not available within the set or in `pkgs`, such as a package in a let binding, it will not be spliced

    # ex:

    # ```

    # nix-repl> darwin.apple_sdk.frameworks.CoreFoundation

    #   «derivation ...CoreFoundation-11.0.0.drv»

    # nix-repl> darwin.CoreFoundation

    #   error: attribute 'CoreFoundation' missing

    # nix-repl> darwin.callPackage ({ CoreFoundation }: CoreFoundation) { }

    #   «derivation ...CoreFoundation-11.0.0.drv»

    # ```

    , extra ? (_spliced0: {})

    , f

    }:

lib/systems/examples.nix

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ rec { 
  };



  gnu64 = { config = "x86_64-unknown-linux-gnu"; };

  gnu64_simplekernel = gnu64 // platforms.pc_simplekernel; # see test/cross/default.nix

  gnu32  = { config = "i686-unknown-linux-gnu"; };



  musl64 = { config = "x86_64-unknown-linux-musl"; };

maintainers/maintainer-list.nix

+12 −0
Original line number Diff line number Diff line
@@ -1411,6 +1411,12 @@ 
    githubId = 58516559;

    name = "Alexander Rezvov";

  };

  argrat = {

    email = "n.bertazzo@protonmail.com";

    github = "argrat";

    githubId = 98821629;

    name = "Nicolò Bertazzo";

  };

  arian-d = {

    email = "arianxdehghani@gmail.com";

    github = "arian-d";
@@ -19179,6 +19185,12 @@ 
    githubId = 43315;

    name = "William Roe";

  };

  wladmis = {

    email = "dev@wladmis.org";

    github = "wladmis";

    githubId = 5000261;

    name = "Wladmis";

  };

  wldhx = {

    email = "wldhx+nixpkgs@wldhx.me";

    github = "wldhx";

maintainers/team-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -440,6 +440,7 @@ with lib.maintainers; { 
    members = [

      GaetanLepage

      natsukium

      thomasjm

    ];

    scope = "Maintain Jupyter and related packages.";

    shortName = "Jupyter";

nixos/modules/programs/wayland/sway.nix

+0 −13
Original line number Diff line number Diff line
@@ -42,11 +42,6 @@ in { 
      <https://github.com/swaywm/sway/wiki> and

      "man 5 sway" for more information'');



    enableRealtime = mkEnableOption (lib.mdDoc ''

      add CAP_SYS_NICE capability on `sway` binary for realtime scheduling

      privileges. This may improve latency and reduce stuttering, specially in

      high load scenarios'') // { default = true; };



    package = mkOption {

      type = with types; nullOr package;

      default = defaultSwayPackage;
@@ -154,14 +149,6 @@ in { 
            "sway/config".source = mkOptionDefault "${cfg.package}/etc/sway/config";

          };

        };

        security.wrappers = mkIf (cfg.enableRealtime && cfg.package != null) {

          sway = {

            owner = "root";

            group = "root";

            source = "${cfg.package}/bin/sway";

            capabilities = "cap_sys_nice+ep";

          };

        };

        # To make a Sway session available if a display manager like SDDM is enabled:

        services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ]; }

      (import ./wayland-session.nix { inherit lib pkgs; })