Unverified Commit 44f5a715 authored by K.B.Dharun Krishna's avatar K.B.Dharun Krishna Committed by GitHub
Browse files

Merge branch 'NixOS:master' into patch-1

parents 51e2d742 43f884e9

lib/systems/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ rec { 
        ({

          linux-kernel = args.linux-kernel or {};

          gcc = args.gcc or {};

          rustc = args.rust or {};

          rustc = args.rustc or {};

        } // platforms.select final)

        linux-kernel gcc rustc;

maintainers/maintainer-list.nix

+21 −0
Original line number Diff line number Diff line
@@ -6792,6 +6792,15 @@ 
    githubId = 54999;

    name = "Ariel Nunez";

  };

  Intuinewin = {

    email = "antoinelabarussias@gmail.com";

    github = "Intuinewin";

    githubId = 13691729;

    name = "Antoine Labarussias";

    keys = [{

      fingerprint = "5CB5 9AA0 D180 1997 2FB3  E0EC 943A 1DE9 372E BE4E";

    }];

  };

  ionutnechita = {

    email = "ionut_n2001@yahoo.com";

    github = "ionutnechita";
@@ -7905,6 +7914,12 @@ 
    githubId = 2469618;

    name = "Junji Hashimoto";

  };

  jurraca = {

    email = "julienu@pm.me";

    github = "jurraca";

    githubId = 5124422;

    name = "Julien Urraca";

  };

  justinas = {

    email = "justinas@justinas.org";

    github = "justinas";
@@ -9026,6 +9041,12 @@ 
      fingerprint = "74F5 E5CC 19D3 B5CB 608F  6124 68FF 81E6 A785 0F49";

    }];

  };

  lizelive = {

    email = "nixpkgs@lize.live";

    github = "lizelive";

    githubId = 40217331;

    name = "LizeLive";

  };

  lluchs = {

    email = "lukas.werling@gmail.com";

    github = "lluchs";

nixos/doc/manual/release-notes/rl-2305.section.md

+2 −0
Original line number Diff line number Diff line
@@ -290,6 +290,8 @@ In addition to numerous new and upgraded packages, this release has the followin 


- The `zplug` package changes its output path from `$out` to `$out/share/zplug`. Users should update their dependency on `${pkgs.zplug}/init.zsh` to `${pkgs.zplug}/share/zplug/init.zsh`.



- The `pict-rs` package was updated from an 0.3 alpha release to 0.3 stable, and related environment variables now require two underscores instead of one.



## Other Notable Changes {#sec-release-23.05-notable-changes}



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

nixos/modules/programs/shadow.nix

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ let 
      # This should be made configurable.

      #CHFN_RESTRICT frwh



      # The default crypt() method, keep in sync with the PAM default

      ENCRYPT_METHOD YESCRYPT

    '';



  mkSetuidRoot = source:

nixos/modules/services/web-apps/pict-rs.nix

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ in 
  config = lib.mkIf cfg.enable {

    systemd.services.pict-rs = {

      environment = {

        PICTRS_PATH = cfg.dataDir;

        PICTRS_ADDR = "${cfg.address}:${toString cfg.port}";

        PICTRS__PATH = cfg.dataDir;

        PICTRS__ADDR = "${cfg.address}:${toString cfg.port}";

      };

      wantedBy = [ "multi-user.target" ];

      serviceConfig = {