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

Merge master into staging-next

parents 741c01df b0051767

nixos/modules/services/x11/desktop-managers/plasma5.nix

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ in 
          pkgs.maliit-framework

          pkgs.maliit-keyboard

        ]

        ++ lib.optionals (cfg.mobile.installRecommendedSoftware) (with libsForQt5.plasmaMobileGear;[

        ++ lib.optionals (cfg.mobile.installRecommendedSoftware) (with pkgs.plasma5Packages.plasmaMobileGear; [

          # Additional software made for Plasma Mobile.

          alligator

          angelfish

nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix

+4 −3
Original line number Diff line number Diff line
@@ -54,17 +54,18 @@ let 
  checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" {

    nativeBuildInputs = [ pkgs.mypy ];

  } ''

    install -m755 ${systemdBootBuilder} $out

    mkdir -p $out/bin

    install -m755 ${systemdBootBuilder} $out/bin/systemd-boot-builder

    mypy \

      --no-implicit-optional \

      --disallow-untyped-calls \

      --disallow-untyped-defs \

      $out

      $out/bin/systemd-boot-builder

  '';



  finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" ''

    #!${pkgs.runtimeShell}

    ${checkedSystemdBootBuilder} "$@"

    ${checkedSystemdBootBuilder}/bin/systemd-boot-builder "$@"

    ${cfg.extraInstallCommands}

  '';

in {

pkgs/applications/graphics/digikam/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ mkDerivation rec { 
    description = "Photo Management Program";

    license = licenses.gpl2;

    homepage = "https://www.digikam.org";

    maintainers = with maintainers; [ spacefault ];

    platforms = platforms.linux;

    mainProgram = "digikam";

  };

pkgs/tools/misc/ipxe/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ in 


stdenv.mkDerivation rec {

  pname = "ipxe";

  version = "unstable-2023-07-19";

  version = "unstable-2024-01-19";



  nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux;

  depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -43,8 +43,8 @@ stdenv.mkDerivation rec { 
  src = fetchFromGitHub {

    owner = "ipxe";

    repo = "ipxe";

    rev = "c1834f323f4f6b9b46cd5895b1457a117381363f";

    hash = "sha256-fJeDgm+OaItshWFliq08Y0BPDD2FCkezeEp7trqWNjA=";

    rev = "de8a0821c7bc737e724fa3dfb6d89dc36f591d7a";

    hash = "sha256-bVFr1fTulww6swWPKupWRGfQOAiXp2oP1/VC5GpzLnY=";

  };



  postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 ''