ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 16:57:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2024-01-27 06:01:07 +00:00 committed by GitHub
commit 3fdd362299
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/plasma5.nix
View File

@ -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

7
nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
View File

@ -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 {

1
pkgs/applications/graphics/digikam/default.nix
View File

@ -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";
};

6
pkgs/tools/misc/ipxe/default.nix
View File

@ -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 ''