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

Merge master into staging-next

parents 31a78bf8 0488e230

doc/hooks/tauri.section.md

+2 −2
Original line number Diff line number Diff line
@@ -52,12 +52,12 @@ rustPlatform.buildRustPackage rec { 


  buildInputs =

    [ openssl ]

    ++ lib.optionals stdenv.isLinux [

    ++ lib.optionals stdenv.hostPlatform.isLinux [

      glib-networking # Most Tauri apps need networking

      libsoup

      webkitgtk_4_0

    ]

    ++ lib.optionals stdenv.isDarwin (

    ++ lib.optionals stdenv.hostPlatform.isDarwin (

      with darwin.apple_sdk.frameworks;

      [

        AppKit

maintainers/maintainer-list.nix

+13 −1
Original line number Diff line number Diff line
@@ -2832,6 +2832,12 @@ 
    githubId = 24254289;

    name = "Payas Relekar";

  };

  bhasherbel = {

    email = "nixos.maintainer@bhasher.com";

    github = "bhasherbel";

    githubId = 45831883;

    name = "Brieuc Dubois";

  };

  bhipple = {

    email = "bhipple@protonmail.com";

    github = "bhipple";
@@ -5841,7 +5847,7 @@ 
    name = "Sebastian Krohn";

  };

  drawbu = {

    email = "clement21.boillot@gmail.com";

    email = "clement2104.boillot@gmail.com";

    github = "drawbu";

    githubId = 69208565;

    name = "Clément Boillot";
@@ -10941,6 +10947,12 @@ 
    githubId = 54635632;

    keys = [ { fingerprint = "4C68 56EE DFDA 20FB 77E8  9169 1964 2151 C218 F6F5"; } ];

  };

  jthulhu = {

    name = "Adrien Mathieu";

    email = "adrien.lc.mathieu@gmail.com";

    github = "jthulhu";

    githubId = 23179762;

  };

  jtobin = {

    email = "jared@jtobin.io";

    github = "jtobin";

nixos/modules/hardware/graphics.nix

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ in 
    assertions = [

      {

        assertion = cfg.enable32Bit -> pkgs.stdenv.hostPlatform.isx86_64;

        message = "`hardware.graphics.enable32Bit` only makes sense on a 64-bit system.";

        message = "`hardware.graphics.enable32Bit` is only supported on an x86_64 system.";

      }

      {

        assertion = cfg.enable32Bit -> (config.boot.kernelPackages.kernel.features.ia32Emulation or false);

pkgs/applications/version-management/gitoxide/default.nix

+2 −4
Original line number Diff line number Diff line
@@ -4,9 +4,7 @@ 
, cmake

, pkg-config

, stdenv

, libiconv

, Security

, SystemConfiguration

, apple-sdk_11

, curl

, openssl

, buildPackages
@@ -33,7 +31,7 @@ in rustPlatform.buildRustPackage rec { 
  nativeBuildInputs = [ cmake pkg-config installShellFiles ];



  buildInputs = [ curl ] ++ (if stdenv.hostPlatform.isDarwin

    then [ libiconv Security SystemConfiguration ]

    then [ apple-sdk_11 ]

    else [ openssl ]);



  preFixup = lib.optionalString canRunCmd ''

pkgs/applications/window-managers/i3/lock-fancy-rapid.nix

+8 −1
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, xorg, i3lock }:

{

  lib,

  stdenv,

  fetchFromGitHub,

  xorg,

  i3lock,

}:



stdenv.mkDerivation {

  pname = "i3lock-fancy-rapid";
@@ -33,6 +39,7 @@ stdenv.mkDerivation { 
    description = "Faster implementation of i3lock-fancy";

    homepage = "https://github.com/yvbbrjdr/i3lock-fancy-rapid";

    maintainers = with maintainers; [ nickhu ];

    mainProgram = "i3lock-fancy-rapid";

    license = licenses.bsd3;

    platforms = platforms.linux;

  };