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

staging-next 2025-10-07 (#449539)

parents 2fbfb821 5ee8efde

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

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


- LLVM 12, 13, 14, 15, 16, and 17 have been removed, as they have reached end‐of‐life upstream and are no longer supported.



- The `vlock` output from kbd has been removed. Instead a new package `kbdVlock` has been introduced. Use this package now instead of the output.



- GHCJS 8.10, exposed via `haskell.compiler.ghcjs` and `haskell.compiler.ghcjs810`, has been removed. Downstream users should migrate their projects to the new JavaScript backend of GHC proper which can be used via `pkgsCross.ghcjs` from Nixpkgs. Haskell packaging code, like `haskellPackages.mkDerivation`, `ghcWithPackages` and `hoogleWithPackages`, also no longer supports GHCJS.



- GHC 8.6, 8.10, 9.0, 9.2, and their package sets have been removed.

lib/licenses.nix

+5 −0
Original line number Diff line number Diff line
@@ -172,6 +172,11 @@ lib.mapAttrs mkLicense ( 
      fullName = "Baekmuk License";

    };



    bitstreamCharter = {

      spdxId = "Bitstream-Charter";

      fullName = "Bitstream Charter Font License";

    };



    bitstreamVera = {

      spdxId = "Bitstream-Vera";

      fullName = "Bitstream Vera Font License";

nixos/modules/config/users-groups.nix

+2 −0
Original line number Diff line number Diff line
@@ -871,6 +871,7 @@ in 
        render.gid = ids.gids.render;

        sgx.gid = ids.gids.sgx;

        shadow.gid = ids.gids.shadow;

        clock.gid = ids.gids.clock;

      };



      system.activationScripts.users =
@@ -1033,6 +1034,7 @@ in 
          cdrom = { };

          tape = { };

          kvm = { };

          clock = { };

        };

      };

nixos/modules/misc/ids.nix

+1 −0
Original line number Diff line number Diff line
@@ -690,6 +690,7 @@ in 
      rstudio-server = 324;

      localtimed = 325;

      automatic-timezoned = 326;

      clock = 327;



      # When adding a gid, make sure it doesn't match an existing

      # uid. Users and groups with the same name should have equal

nixos/modules/programs/ssh.nix

+25 −25
Original line number Diff line number Diff line
@@ -339,37 +339,37 @@ in 


    # SSH configuration. Slight duplication of the sshd_config

    # generation in the sshd service.

    environment.etc."ssh/ssh_config".text = ''

    environment.etc."ssh/ssh_config".text = lib.concatStringsSep "\n" (

      # Custom options from `extraConfig`, to override generated options

      ${cfg.extraConfig}



      lib.optional (cfg.extraConfig != "") cfg.extraConfig

      ++ [

        ''

          # Generated options from other settings

          Host *

      ${lib.optionalString cfg.systemd-ssh-proxy.enable ''

        ''

      ]

      ++ lib.optional cfg.systemd-ssh-proxy.enable ''

        # See systemd-ssh-proxy(1)

        Include ${config.systemd.package}/lib/systemd/ssh_config.d/20-systemd-ssh-proxy.conf

      ''}



      GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}



      ${lib.optionalString (!config.networking.enableIPv6) "AddressFamily inet"}

      ${lib.optionalString cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth"}

      ${lib.optionalString (cfg.forwardX11 != null)

        "ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}"

      }



      ${lib.optionalString (

      ''

      ++ [

        "GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}"

      ]

      ++ lib.optional (!config.networking.enableIPv6) "AddressFamily inet"

      ++ lib.optional cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth"

      ++ lib.optional (cfg.forwardX11 != null) "ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}"

      ++ lib.optional (

        cfg.pubkeyAcceptedKeyTypes != [ ]

      ) "PubkeyAcceptedKeyTypes ${builtins.concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"}

      ${lib.optionalString (

      ) "PubkeyAcceptedKeyTypes ${builtins.concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"

      ++ lib.optional (

        cfg.hostKeyAlgorithms != [ ]

      ) "HostKeyAlgorithms ${builtins.concatStringsSep "," cfg.hostKeyAlgorithms}"}

      ${lib.optionalString (

      ) "HostKeyAlgorithms ${builtins.concatStringsSep "," cfg.hostKeyAlgorithms}"

      ++ lib.optional (

        cfg.kexAlgorithms != null

      ) "KexAlgorithms ${builtins.concatStringsSep "," cfg.kexAlgorithms}"}

      ${lib.optionalString (cfg.ciphers != null) "Ciphers ${builtins.concatStringsSep "," cfg.ciphers}"}

      ${lib.optionalString (cfg.macs != null) "MACs ${builtins.concatStringsSep "," cfg.macs}"}

    '';

      ) "KexAlgorithms ${builtins.concatStringsSep "," cfg.kexAlgorithms}"

      ++ lib.optional (cfg.ciphers != null) "Ciphers ${builtins.concatStringsSep "," cfg.ciphers}"

      ++ lib.optional (cfg.macs != null) "MACs ${builtins.concatStringsSep "," cfg.macs}"

    );



    environment.etc."ssh/ssh_known_hosts".text = knownHostsText;