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

Merge staging-next into staging

parents 8d2846ed e0ff81ac

maintainers/team-list.nix

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

    members = [

      connorbaker

      samuela

      SomeoneSerge

    ];

    scope = "Maintain CUDA-enabled packages";

nixos/modules/services/networking/wireguard.nix

+19 −10
Original line number Diff line number Diff line
@@ -170,10 +170,22 @@ let 


  # peer options



  peerOpts = {

  peerOpts = self: {



    options = {



      name = mkOption {

        default =

          replaceStrings

            [ "/" "-"     " "     "+"     "="     ]

            [ "-" "\\x2d" "\\x20" "\\x2b" "\\x3d" ]

            self.config.publicKey;

        defaultText = literalExpression "publicKey";

        example = "bernd";

        type = types.str;

        description = lib.mdDoc "Name used to derive peer unit name.";

      };



      publicKey = mkOption {

        example = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg=";

        type = types.singleLineStr;
@@ -313,15 +325,11 @@ let 
        '';

      };



  peerUnitServiceName = interfaceName: publicKey: dynamicRefreshEnabled:

  peerUnitServiceName = interfaceName: peerName: dynamicRefreshEnabled:

    let

      keyToUnitName = replaceStrings

        [ "/" "-"    " "     "+"     "="      ]

        [ "-" "\\x2d" "\\x20" "\\x2b" "\\x3d" ];

      unitName = keyToUnitName publicKey;

      refreshSuffix = optionalString dynamicRefreshEnabled "-refresh";

    in

      "wireguard-${interfaceName}-peer-${unitName}${refreshSuffix}";

      "wireguard-${interfaceName}-peer-${peerName}${refreshSuffix}";



  generatePeerUnit = { interfaceName, interfaceCfg, peer }:

    let
@@ -337,10 +345,11 @@ let 
      # We generate a different name (a `-refresh` suffix) when `dynamicEndpointRefreshSeconds`

      # to avoid that the same service switches `Type` (`oneshot` vs `simple`),

      # with the intent to make scripting more obvious.

      serviceName = peerUnitServiceName interfaceName peer.publicKey dynamicRefreshEnabled;

      serviceName = peerUnitServiceName interfaceName peer.name dynamicRefreshEnabled;

    in nameValuePair serviceName

      {

        description = "WireGuard Peer - ${interfaceName} - ${peer.publicKey}";

        description = "WireGuard Peer - ${interfaceName} - ${peer.name}"

          + optionalString (peer.name != peer.publicKey) " (${peer.publicKey})";

        requires = [ "wireguard-${interfaceName}.service" ];

        wants = [ "network-online.target" ];

        after = [ "wireguard-${interfaceName}.service" "network-online.target" ];
@@ -418,7 +427,7 @@ let 
  # the target is required to start new peer units when they are added

  generateInterfaceTarget = name: values:

    let

      mkPeerUnit = peer: (peerUnitServiceName name peer.publicKey (peer.dynamicEndpointRefreshSeconds != 0)) + ".service";

      mkPeerUnit = peer: (peerUnitServiceName name peer.name (peer.dynamicEndpointRefreshSeconds != 0)) + ".service";

    in

    nameValuePair "wireguard-${name}"

      rec {

pkgs/applications/audio/pt2-clone/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 


stdenv.mkDerivation rec {

  pname = "pt2-clone";

  version = "1.57";

  version = "1.58";



  src = fetchFromGitHub {

    owner = "8bitbubsy";

    repo = "pt2-clone";

    rev = "v${version}";

    sha256 = "sha256-YUGTcL/k+MbAnB/kcWPEmrGxGF/kSHdIgdBVUqCsDWM=";

    sha256 = "sha256-5i892C5aJWgouIgD3FkojJfEhN08Jf1d7HDMvdT82aU=";

  };



  nativeBuildInputs = [ cmake ];

pkgs/applications/audio/snd/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ 


stdenv.mkDerivation rec {

  pname = "snd";

  version = "23.2";

  version = "23.3";



  src = fetchurl {

    url = "mirror://sourceforge/snd/snd-${version}.tar.gz";

    sha256 = "sha256-MLBFK34RgpEoK2reA+Ik35pY5YuzetDU1Wz9yAPQhEc=";

    sha256 = "sha256-YuvTgpa006n+WlQHEtVRfoJl7IBoyevzURz0Suis5sE=";

  };



  nativeBuildInputs = [ pkg-config ];

pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix

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


  tree-sitter-langs = callPackage ./manual-packages/tree-sitter-langs { final = self; };



  treesit-grammars = callPackage ./manual-packages/treesit-grammars { };



  tsc = callPackage ./manual-packages/tsc { };



  urweb-mode = callPackage ./manual-packages/urweb-mode { };