Merge update papers, fix libspelling to have gktsourceview5 in propagatedBuildInputs (#406778)

pkgs/by-name/li/libspelling/package.nix

@@ -42,14 +42,19 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    glib
-    gtk4
-    gtksourceview5
     enchant
     icu
     libsysprof-capture
   ];
 
+  propagatedBuildInputs = [
+    # These were moved from buildInputs because they are
+    # listed in `Requires` key of `libspelling-1.pc`
+    glib
+    gtk4
+    gtksourceview5
+  ];
+
   postFixup = ''
     # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
     moveToOutput "share/doc" "$devdoc"

pkgs/by-name/pa/papers/package.nix

@@ -16,7 +16,6 @@
   poppler,
   nautilus,
   djvulibre,
-  libspectre,
   libarchive,
   libsecret,
   wrapGAppsHook4,
@@ -26,7 +25,8 @@
   gsettings-desktop-schemas,
   dbus,
   gi-docgen,
-  libgxps,
+  libsysprof-capture,
+  libspelling,
   withLibsecret ? true,
   supportNautilus ? (!stdenv.hostPlatform.isDarwin),
   libadwaita,
@@ -37,7 +37,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "papers";
-  version = "47.3";
+  version = "48.2";
 
   outputs = [
     "out"
@@ -47,19 +47,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz";
-    hash = "sha256-PlhTk+gef6D5r55U38hvYSa1w9hS6pDf3DumsHlSxKo=";
+    hash = "sha256-HpvFlhNCS/ZVIjxr3Khzri8d2ifPAtc0K/9bVZBRYG0=";
   };
 
-  cargoRoot = "shell-rs";
-
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs)
       src
       pname
       version
-      cargoRoot
       ;
-    hash = "sha256-66pOdZxgzbvXkvF07rNvWtcF/dJ2+RuS24IeI/VWykE=";
+    hash = "sha256-1HFecOTn84m9lT166HlmYjqP+KN/ZOTWW4ztigrpqNQ=";
   };
 
   nativeBuildInputs = [
@@ -88,9 +85,9 @@ stdenv.mkDerivation (finalAttrs: {
       gsettings-desktop-schemas
       libadwaita
       libarchive
-      libgxps
       librsvg
-      libspectre
+      libsysprof-capture
+      libspelling
       pango
       poppler
     ]
@@ -102,10 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     ];
 
   mesonFlags =
-    [
-      "-Dps=enabled"
-    ]
-    ++ lib.optionals (!withLibsecret) [
+    lib.optionals (!withLibsecret) [
       "-Dkeyring=disabled"
     ]
     ++ lib.optionals (!supportNautilus) [