Merge master into staging-next

pkgs/by-name/ca/cables/package.nix

@@ -7,12 +7,12 @@
 
 let
   pname = "cables";
-  version = "0.6.0";
+  version = "0.7.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage";
-    sha256 = "sha256-EvlKcSYLC9gIzXHJSHrxPY984AdKCL7psj2F2vdfaZY=";
+    sha256 = "sha256-8PYHX23E91rUEfzU6fthSTVOnnHeoRjbcNFbuOyeBS8=";
   };
 
   appimageContents = appimageTools.extract {

pkgs/by-name/ha/haruna/package.nix

@@ -2,25 +2,11 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  breeze-icons,
-  breeze,
   cmake,
-  extra-cmake-modules,
   ffmpeg-headless,
-  kconfig,
-  kcoreaddons,
-  kfilemetadata,
-  ki18n,
-  kiconthemes,
-  kio,
-  kirigami,
-  kxmlgui,
-  kdoctools,
-  mpvqt,
+  kdePackages,
   pkg-config,
-  wrapQtAppsHook,
-  qqc2-desktop-style,
-  qtbase,
+  qt6,
   yt-dlp,
 }:
 
@@ -42,36 +28,36 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    breeze-icons
-    breeze
-    qqc2-desktop-style
+    kdePackages.breeze-icons
+    kdePackages.breeze
+    kdePackages.qqc2-desktop-style
     yt-dlp
 
     ffmpeg-headless
-    kconfig
-    kcoreaddons
-    kfilemetadata
-    ki18n
-    kiconthemes
-    kio
-    kirigami
-    kxmlgui
-    kdoctools
-    mpvqt
-    qtbase
+    kdePackages.kconfig
+    kdePackages.kcoreaddons
+    kdePackages.kfilemetadata
+    kdePackages.ki18n
+    kdePackages.kiconthemes
+    kdePackages.kio
+    kdePackages.kirigami
+    kdePackages.kxmlgui
+    kdePackages.kdoctools
+    kdePackages.mpvqt
+    qt6.qtbase
   ];
 
   nativeBuildInputs = [
     cmake
-    extra-cmake-modules
+    kdePackages.extra-cmake-modules
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://invent.kde.org/multimedia/haruna";
     description = "Open source video player built with Qt/QML and libmpv";
-    license = with licenses; [
+    license = with lib.licenses; [
       bsd3
       cc-by-40
       cc-by-sa-40
@@ -80,7 +66,7 @@ stdenv.mkDerivation rec {
       gpl3Plus
       wtfpl
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       jojosch
       kashw2
     ];

pkgs/by-name/ho/hollywood/package.nix

@@ -8,7 +8,7 @@
   atop,
   bmon,
   cmatrix,
-  pygments,
+  python3Packages,
   moreutils,
   util-linux,
   jp2a,
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
         atop
         bmon
         cmatrix
-        pygments
+        python3Packages.pygments
         moreutils
         util-linux
         man

pkgs/by-name/in/inko/package.nix

@@ -13,14 +13,14 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "inko";
   version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "inko-lang";
     repo = "inko";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-jVfAfR02R2RaTtzFSBoLuq/wdPaaI/eochrZaRVdmHY=";
   };
 
@@ -72,4 +72,4 @@ rustPlatform.buildRustPackage rec {
     platforms = lib.platforms.unix;
     mainProgram = "inko";
   };
-}
+})

pkgs/by-name/te/tela-circle-icon-theme/package.nix

@@ -3,7 +3,7 @@
   stdenvNoCC,
   fetchFromGitHub,
   adwaita-icon-theme,
-  breeze-icons,
+  libsForQt5,
   gtk3,
   hicolor-icon-theme,
   jdupes,
@@ -44,7 +44,7 @@ lib.checkListOfEnum "${pname}: color variants"
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
-      rev = version;
+      tag = version;
       hash = "sha256-5Kqf6QNM+/JGGp2H3Vcl69Vh1iZYPq3HJxhvSH6k+eQ=";
     };
 
@@ -55,7 +55,7 @@ lib.checkListOfEnum "${pname}: color variants"
 
     propagatedBuildInputs = [
       adwaita-icon-theme
-      breeze-icons
+      libsForQt5.breeze-icons
       hicolor-icon-theme
     ];
 
@@ -84,11 +84,11 @@ lib.checkListOfEnum "${pname}: color variants"
 
     passthru.updateScript = gitUpdater { };
 
-    meta = with lib; {
+    meta = {
       description = "Flat and colorful personality icon theme";
       homepage = "https://github.com/vinceliuice/Tela-circle-icon-theme";
-      license = licenses.gpl3Only;
-      platforms = platforms.linux; # darwin use case-insensitive filesystems that cause hash mismatches
-      maintainers = with maintainers; [ romildo ];
+      license = lib.licenses.gpl3Only;
+      platforms = lib.platforms.linux; # darwin use case-insensitive filesystems that cause hash mismatches
+      maintainers = with lib.maintainers; [ romildo ];
     };
   }

pkgs/development/tools/ocaml/melange/default.nix

@@ -23,25 +23,25 @@ let
   versionHash =
     if lib.versionAtLeast ocaml.version "5.3" then
       {
-        version = "5.0.0-53";
-        hash = "sha256-ZZ3/TdhEJQ74Q3wJkWqoiONEfV6x77z0Sbr8cAirXbA=";
+        version = "5.1.0-53";
+        hash = "sha256-96rDDzul/v+Dc+IWTNtbOKWUV8rf7HS1ZMK2LQNcpKk=";
       }
     else if lib.versionAtLeast ocaml.version "5.2" then
       {
-        version = "5.0.0-52";
-        hash = "sha256-DyjBiMvnCHufFepk8xHMMmVU+j/yECvV7My4WeAW4WQ=";
+        version = "5.1.0-52";
+        hash = "sha256-EGIInGCo3JADYyE4mLw5Fzkm4OB+V9yi2ayV0lVq3v0=";
       }
     else if lib.versionAtLeast ocaml.version "5.1" then
       {
-        version = "5.0.0-51";
-        hash = "sha256-rPU6pqzEDo5heGkHhMGfwsF8elDohoptNbbZyGcWLKA=";
+        version = "5.1.0-51";
+        hash = "sha256-DIF8vZLEKsFf6m5tl1/T6zqjHyKxDMois2h//tDhsJI=";
       }
     else if lib.versionAtLeast ocaml.version "5.0" then
       throw "melange is not available for OCaml ${ocaml.version}"
     else
       {
-        version = "5.0.0-414";
-        hash = "sha256-07+tEx6b5dUY949VF2K22HqRSoKmvBwnxo7B/Gqb+ro=";
+        version = "5.1.0-414";
+        hash = "sha256-Sv1XyOqCNhICTsXzetXh/zqX/tdTupYZ0Q1nZRLfpe0=";
       };
   version = versionHash.version;
   hash = versionHash.hash;
@@ -58,9 +58,11 @@ buildDunePackage {
     cppo
     makeWrapper
   ];
-  propagatedBuildInputs = [
+  buildInputs = [
     cmdliner
     dune-build-info
+  ];
+  propagatedBuildInputs = [
     menhirLib
     ppxlib
   ];

pkgs/top-level/all-packages.nix

@@ -11666,10 +11666,6 @@ with pkgs;
 
   themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) { };
 
-  tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme {
-    inherit (libsForQt5) breeze-icons;
-  };
-
   tex-gyre = callPackages ../data/fonts/tex-gyre { };
 
   tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { };
@@ -12079,8 +12075,6 @@ with pkgs;
     };
   };
 
-  haruna = kdePackages.callPackage ../applications/video/haruna { };
-
   input-leap = qt6Packages.callPackage ../applications/misc/input-leap {
     avahi = avahi.override { withLibdnssdCompat = true; };
   };
@@ -12506,10 +12500,6 @@ with pkgs;
       haskellPackages.hledger-web;
   hledger-utils = with python3.pkgs; toPythonApplication hledger-utils;
 
-  hollywood = callPackage ../applications/misc/hollywood {
-    inherit (python3Packages) pygments;
-  };
-
   hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { };
 
   hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack;