caelestia-shell: 2.4.0 -> 2.5.0 (#564695)

OmniWM moved from github.com/BarutSRB/OmniWM to the OmniNull
organization. The old URLs redirect, but point the source URL and
homepage at the canonical location. The release asset and its hash
are unchanged, so this does not rebuild the package.

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

@@ -277,6 +277,7 @@ in
           warpinator
 
           # cinnamon xapp
+          xepub
           xviewer
           xreader
           xed-editor

pkgs/by-name/bi/bitsnpicas/package.nix

@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "bitsnpicas";
-  version = "2.2";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "kreativekorp";
     repo = "bitsnpicas";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TIpnefPLHgKXJfBhrYbYG+/kpHjWpk/VrJvu1LKHf4o=";
+    hash = "sha256-+LmAav7E5boKNVby4YusSqNGt4PSSnefxsF10O8/deo=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ca/caelestia-shell/package.nix

@@ -33,8 +33,8 @@
   withCli ? true,
 }:
 let
-  version = "2.4.0";
-  rev = "24aa15eefdb146350d2548c0a015b04eddbd1008";
+  version = "2.5.0";
+  rev = "d999d4878ee4cec134168e60d913714566a8cfa6";
 
   m3shapes_src = fetchFromGitHub {
     owner = "soramanew";
@@ -75,7 +75,7 @@ let
 
   shellSrc = fetchurl {
     url = "https://github.com/caelestia-dots/shell/releases/download/v${version}/caelestia-shell-v${version}.tar.gz";
-    hash = "sha256-r3SRcn/zBplpgVD598GGCJzNFxpQne8zK8uh3hyzF3E=";
+    hash = "sha256-a++f7/n5xq/rb98Lm7HPw8/X3/TCoCDoB51nIJdfO2o=";
   };
 
   extras = stdenv.mkDerivation {

pkgs/by-name/mi/mint-x-icons/package.nix

@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mint-x-icons";
-  version = "1.7.6";
+  version = "1.7.7";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "mint-x-icons";
     rev = version;
-    hash = "sha256-gGldt2tGko3IukpKjn0xGAe4cL21YPCECJfcOX5F8n0=";
+    hash = "sha256-rCH+28vMLTbX/Gfi55XD7VFKU9vGadOAKTku2CTYo5c=";
   };
 
   propagatedBuildInputs = [

pkgs/by-name/om/omniwm/package.nix

@@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   version = "0.6.8";
 
   src = fetchurl {
-    url = "https://github.com/BarutSRB/OmniWM/releases/download/v${finalAttrs.version}/OmniWM-v${finalAttrs.version}.zip";
+    url = "https://github.com/OmniNull/OmniWM/releases/download/v${finalAttrs.version}/OmniWM-v${finalAttrs.version}.zip";
     hash = "sha256-CCOWPIpcO96FT3/dA82MJcRCGkC9b3SETyyPfBaiZ2U=";
   };
 
@@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = {
     description = "MacOS Niri and Hyprland inspired tiling window manager";
-    homepage = "https://github.com/BarutSRB/OmniWM";
+    homepage = "https://github.com/OmniNull/OmniWM";
     license = lib.licenses.gpl2Only;
     mainProgram = "OmniWM";
     platforms = [ "aarch64-darwin" ];

pkgs/by-name/xe/xepub/package.nix

@@ -0,0 +1,75 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  gobject-introspection,
+  meson,
+  ninja,
+  python3Packages,
+  wrapGAppsHook3,
+  glib,
+  gtk3,
+  python3,
+  webkitgtk_4_1,
+  xapp,
+  xapp-symbolic-icons,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xepub";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "xapp-project";
+    repo = "xepub";
+    tag = finalAttrs.version;
+    hash = "sha256-kEhGBY6WyE+mpZn10Ll3GO+sCPwdGXbHqaziA9y7wZY=";
+  };
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    gobject-introspection
+    meson
+    ninja
+    python3Packages.wrapPython
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+    python3
+    webkitgtk_4_1
+    xapp
+  ];
+
+  pythonPath = with python3Packages; [
+    pygobject3
+    python-xapp
+    setproctitle
+  ];
+
+  postPatch = ''
+    substituteInPlace meson.build --replace-fail "/usr/bin/python3" "python3"
+  '';
+
+  preFixup = ''
+    buildPythonPath "$out ''${pythonPath[*]}"
+
+    gappsWrapperArgs+=(
+      --prefix PYTHONPATH : "$program_PYTHONPATH"
+      --prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share" [ xapp-symbolic-icons ]}"
+    )
+  '';
+
+  meta = {
+    description = "EPUB reader for Linux desktops";
+    mainProgram = "xepub";
+    homepage = "https://github.com/xapp-project/xepub";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.cinnamon ];
+  };
+})

pkgs/by-name/xr/xreader/package.nix

@@ -19,8 +19,6 @@
   poppler,
   libspectre,
   libgxps,
-  webkitgtk_4_1,
-  mathjax,
   ninja,
   djvulibre,
   backends ? [
@@ -31,19 +29,18 @@
     "pixbuf"
     "comics"
     "xps"
-    "epub"
   ],
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xreader";
-  version = "4.6.5";
+  version = "4.6.7";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "xreader";
     rev = finalAttrs.version;
-    hash = "sha256-wycQmScxuSlo6Ln6piSBF7kmzvi6FnTm/ES/Ds+/h8I=";
+    hash = "sha256-mSaEVXwX6rErIEi9KxmMrGYunZFK8AbxNCTl8EJQGTM=";
   };
 
   nativeBuildInputs = [
@@ -57,8 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   mesonFlags = [
-    # FIXME: `MathJax.js` is only available in MathJax 2.7.x.
-    "-Dmathjax-directory=${mathjax}"
     "-Dintrospection=true"
   ]
   ++ (map (x: "-D${x}=true") backends);
@@ -74,8 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
     poppler
     libspectre
     libgxps
-    webkitgtk_4_1
-    mathjax
     djvulibre
   ];