Merge pull request #226270 from Flakebi/albert

albert: 0.17.6 -> 0.20.13

nixos/doc/manual/release-notes/rl-2305.section.md

@@ -255,6 +255,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - `fail2ban` has been updated to 1.0.2, which has a few breaking changes compared to 0.11.2 ([changelog for 1.0.1](https://github.com/fail2ban/fail2ban/blob/1.0.1/ChangeLog), [changelog for 1.0.2](https://github.com/fail2ban/fail2ban/blob/1.0.2/ChangeLog))
 
+- `albert` has been updated from 0.17.6 to 0.20.13, and 0.18.0 changed the config format and many plugins ([changelog for 0.18.0](https://github.com/albertlauncher/albert/blob/v0.18.0/CHANGELOG.md))
+
 - Calling `makeSetupHook` without passing a `name` argument is deprecated.
 
 - Top-level buildPlatform,hostPlatform,targetPlatform have been deprecated, use stdenv.X instead.

pkgs/applications/misc/albert/default.nix

@@ -2,27 +2,25 @@
 , stdenv
 , fetchFromGitHub
 , cmake
+, libqalculate
 , muparser
-, python3
+, python3Packages
 , qtbase
-, qtcharts
+, qtscxml
-, qtdeclarative
-, qtgraphicaleffects
 , qtsvg
-, qtx11extras
 , wrapQtAppsHook
 , nix-update-script
 }:
 
 stdenv.mkDerivation rec {
   pname = "albert";
-  version = "0.17.6";
+  version = "0.20.13";
 
   src = fetchFromGitHub {
     owner = "albertlauncher";
     repo = "albert";
     rev = "v${version}";
-    sha256 = "sha256-nbnywrsKvFG8AkayjnylOKSnn7rRWgNv5zE9DDeOmLw=";
+    sha256 = "sha256-zG6XlFOzSpUSswG4kvKf2lgwUSZkzEVslgQBjzVTLYQ=";
     fetchSubmodules = true;
   };
 
@@ -32,20 +30,17 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    libqalculate
     muparser
-    python3
     qtbase
-    qtcharts
+    qtscxml
-    qtdeclarative
-    qtgraphicaleffects
     qtsvg
-    qtx11extras
+  ] ++ (with python3Packages; [ python pybind11 ]);
-  ];
 
   postPatch = ''
     find -type f -name CMakeLists.txt -exec sed -i {} -e '/INSTALL_RPATH/d' \;
 
-    sed -i src/app/main.cpp \
+    sed -i src/nativepluginprovider.cpp \
       -e "/QStringList dirs = {/a    QFileInfo(\"$out/lib\").canonicalFilePath(),"
   '';
 

pkgs/top-level/all-packages.nix

@@ -1451,7 +1451,7 @@ with pkgs;
 
   akku = callPackage ../tools/package-management/akku { };
 
-  albert = libsForQt5.callPackage ../applications/misc/albert { };
+  albert = qt6Packages.callPackage ../applications/misc/albert { };
 
   alice-lg = callPackage ../servers/alice-lg{ };