Merge staging-next into staging

NixOS · Aug 28, 2024 · 3bbf8e8 · 3bbf8e8
2 parents 7cad20c + d62aaef
commit 3bbf8e8
Show file tree

Hide file tree

Showing 76 changed files with 23,568 additions and 2,584 deletions.
diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix
@@ -8,6 +8,7 @@ let
 
   sddm = cfg.package.override (old: {
     withWayland = cfg.wayland.enable;
+    withLayerShellQt = cfg.wayland.compositor == "kwin";
     extraPackages = old.extraPackages or [ ] ++ cfg.extraPackages;
   });
 
@@ -43,11 +44,8 @@ let
       DefaultSession = optionalString (config.services.displayManager.defaultSession != null) "${config.services.displayManager.defaultSession}.desktop";
 
       DisplayServer = if cfg.wayland.enable then "wayland" else "x11";
-    } // optionalAttrs (cfg.wayland.compositor == "kwin") {
-      GreeterEnvironment = concatStringsSep " " [
-        "LANG=C.UTF-8"
-        "QT_WAYLAND_SHELL_INTEGRATION=layer-shell"
-      ];
+    } // optionalAttrs (cfg.wayland.enable && cfg.wayland.compositor == "kwin") {
+      GreeterEnvironment = "QT_WAYLAND_SHELL_INTEGRATION=layer-shell";
       InputMethod = ""; # needed if we are using --inputmethod with kwin
     };
 

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
@@ -2,16 +2,20 @@
   lib,
   callPackage,
   runCommand,
+  layer-shell-qt,
   qtwayland,
   wrapQtAppsHook,
   unwrapped ? callPackage ./unwrapped.nix {},
   withWayland ? false,
+  withLayerShellQt ? false,
   extraPackages ? [],
 }:
 runCommand "sddm-wrapped" {
   inherit (unwrapped) version;
 
-  buildInputs = unwrapped.buildInputs ++ extraPackages ++ lib.optional withWayland qtwayland;
+  buildInputs = unwrapped.buildInputs ++ extraPackages
+    ++ lib.optional withWayland qtwayland
+    ++ lib.optional (withWayland && withLayerShellQt) layer-shell-qt;
   nativeBuildInputs = [ wrapQtAppsHook ];
 
   passthru = {

diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  ffmpeg_4, kio, taglib
+  ffmpeg_7, kio, taglib
 }:
 
 mkDerivation {
@@ -11,5 +11,5 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ ffmpeg_4 kio taglib ];
+  buildInputs = [ ffmpeg_7 kio taglib ];
 }
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
@@ -1,25 +1,73 @@
-{ lib, stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff
-, libwebp, pkg-config, librsvg, glib, gtk2, libXext, libXxf86vm, poppler, vlc
-, ghostscript, makeWrapper, tzdata, makeDesktopItem, copyDesktopItems
-, directoryListingUpdater }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  perl,
+  libX11,
+  libXinerama,
+  libjpeg,
+  libpng,
+  libtiff,
+  libwebp,
+  pkg-config,
+  librsvg,
+  glib,
+  gtk2,
+  libXext,
+  libXxf86vm,
+  poppler,
+  vlc,
+  ghostscript,
+  makeWrapper,
+  tzdata,
+  makeDesktopItem,
+  copyDesktopItems,
+  directoryListingUpdater,
+  htmldoc,
+  binutils,
+  gzip,
+  p7zip,
+  xz,
+  zip,
+  extraRuntimeDeps ? [ ],
+}:
 
 stdenv.mkDerivation rec {
   pname = "eaglemode";
-  version = "0.96.1";
+  version = "0.96.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/eaglemode/${pname}-${version}.tar.bz2";
-    hash = "sha256-FIhCcMghzLg7Odcsou9hBw7kIaqLVUFEAKUk9uwRNNw=";
+    hash = "sha256:1al5n2mcjp0hmsvi4hsdmzd7i0id5i3255xplk0il1nmzydh312a";
   };
 
   # Fixes "Error: No time zones found." on the clock
   postPatch = ''
     substituteInPlace src/emClock/emTimeZonesModel.cpp --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
   '';
 
-  nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ];
-  buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff libwebp
-    librsvg glib gtk2 libXxf86vm libXext poppler vlc ghostscript ];
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+    copyDesktopItems
+  ];
+  buildInputs = [
+    perl
+    libX11
+    libXinerama
+    libjpeg
+    libpng
+    libtiff
+    libwebp
+    librsvg
+    glib
+    gtk2
+    libXxf86vm
+    libXext
+    poppler
+    vlc
+    ghostscript
+  ];
 
   # The program tries to dlopen Xxf86vm, Xext and Xinerama, so we use the
   # trick on NIX_LDFLAGS and dontPatchELF to make it find them.
@@ -32,18 +80,39 @@ stdenv.mkDerivation rec {
 
   dontPatchELF = true;
   # eaglemode expects doc to be in the root directory
-  forceShare = [ "man" "info" ];
+  forceShare = [
+    "man"
+    "info"
+  ];
 
-  installPhase = ''
-    runHook preInstall
-    perl make.pl install dir=$out
-    wrapProgram $out/bin/eaglemode --set EM_DIR "$out" --prefix LD_LIBRARY_PATH : "$out/lib" --prefix PATH : "${ghostscript}/bin"
-    for i in 32 48 96; do
-      mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
-      ln -s $out/res/icons/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png
-    done
-    runHook postInstall
-  '';
+  installPhase =
+    let
+      runtimeDeps = lib.makeBinPath (
+        [
+          ghostscript # renders the manual
+          htmldoc # renders HTML files in file browser
+          perl # various display scripts use Perl
+
+          # archive formats in the file browser:
+          binutils
+          gzip
+          p7zip
+          xz
+          zip
+        ]
+        ++ extraRuntimeDeps
+      );
+    in
+    ''
+      runHook preInstall
+      perl make.pl install dir=$out
+      wrapProgram $out/bin/eaglemode --set EM_DIR "$out" --prefix LD_LIBRARY_PATH : "$out/lib" --prefix PATH : "${runtimeDeps}"
+      for i in 32 48 96; do
+        mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
+        ln -s $out/res/icons/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png
+      done
+      runHook postInstall
+    '';
 
   desktopItems = [
     (makeDesktopItem {
@@ -52,7 +121,12 @@ stdenv.mkDerivation rec {
       icon = pname;
       desktopName = "Eagle Mode";
       genericName = meta.description;
-      categories = [ "Game" "Graphics" "System" "Utility" ];
+      categories = [
+        "Game"
+        "Graphics"
+        "System"
+        "Utility"
+      ];
     })
   ];
 
@@ -66,7 +140,10 @@ stdenv.mkDerivation rec {
     description = "Zoomable User Interface";
     changelog = "https://eaglemode.sourceforge.net/ChangeLog.html";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ chuangzhu ehmry ];
+    maintainers = with maintainers; [
+      chuangzhu
+      ehmry
+    ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/faircamp/Cargo.lock b/pkgs/applications/misc/faircamp/Cargo.lock
diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix
@@ -17,14 +17,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "faircamp";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "simonrepp";
     repo = "faircamp";
     rev = version;
-    hash = "sha256-V8fz65LNNCEhexV+ps3cclc0CJljVlAwBf2KjZCBx88=";
+    hash = "sha256-TMN4DLur61bJAPp2kahBAAjf2lto62X/7rhC88nhISg=";
   };
 
   patches = [

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -102,14 +102,12 @@ let
     "flac"
     "libjpeg"
     "libpng"
-  ] ++ lib.optionals (!chromiumVersionAtLeast "124") [
     # Use the vendored libwebp for M124+ until we figure out how to solve:
     # Running phase: configurePhase
     # ERROR Unresolved dependencies.
     # //third_party/libavif:libavif_enc(//build/toolchain/linux/unbundle:default)
     #   needs //third_party/libwebp:libwebp_sharpyuv(//build/toolchain/linux/unbundle:default)
-    "libwebp"
-  ] ++ [
+    # "libwebp"
     "libxslt"
     # "opus"
   ];

diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix
@@ -1,4 +1,4 @@
-{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg_4, fox_1_6, gdal,
+{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg_7, fox_1_6, gdal,
   git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg,
   libpng, libtiff, libxcrypt, openscenegraph , proj, python3,
   python3Packages, stdenv, swig, xercesc, xorg, zlib }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     bzip2
     eigen
-    ffmpeg_4
+    ffmpeg_7
     fox_1_6
     gdal
     gl2ps

diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix
@@ -3,13 +3,13 @@
 buildKodiAddon rec {
   pname = "youtube";
   namespace = "plugin.video.youtube";
-  version = "7.0.9";
+  version = "7.0.9.2";
 
   src = fetchFromGitHub {
     owner = "anxdpanic";
     repo = "plugin.video.youtube";
     rev = "v${version}";
-    hash = "sha256-C2Xnz4V+jSwkBbroysG5ruidwdeE3V+NutQxW3Nfh6Y=";
+    hash = "sha256-42BBvXIrPAAhNgrGyPTK5dgg2DACPTT6/jRUoYcihFA=";
   };
 
   propagatedBuildInputs = [

diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
@@ -1,35 +1,36 @@
-{ lib
-, fetchFromGitHub
+{
+  lib,
+  fetchFromGitHub,
 
-, cmake
-, ninja
+  cmake,
+  ninja,
 
-, alsa-lib
-, asio
-, curl
-, nlohmann_json
-, obs-studio
-, opencv
-, procps
-, qtbase
-, stdenv
-, tesseract
-, websocketpp
-, xorg
+  alsa-lib,
+  asio,
+  curl,
+  nlohmann_json,
+  obs-studio,
+  opencv,
+  procps,
+  qtbase,
+  stdenv,
+  tesseract,
+  websocketpp,
+  xorg,
 
-, httplib
-, libremidi
+  httplib,
+  libremidi,
 }:
 
 stdenv.mkDerivation rec {
   pname = "advanced-scene-switcher";
-  version = "1.27.1";
+  version = "1.27.2";
 
   src = fetchFromGitHub {
     owner = "WarmUpTill";
     repo = "SceneSwitcher";
     rev = version;
-    hash = "sha256-KP3aYSGjEsytiA7toLSkqKcxgT+2Wu3SKyOG4uga2RI=";
+    hash = "sha256-7IciHCe2KemKNJpD9QcYK4AtxHlYuWaPsBCcVuPVvgA=";
   };
 
   nativeBuildInputs = [