crosswords: 0.3.12 → 0.3.15 (#415376)

pkgs/by-name/cr/crosswords/package.nix

@@ -1,52 +1,60 @@
 {
   lib,
   stdenv,
-  fetchFromGitLab,
-  meson,
-  ninja,
-  pkg-config,
-  wrapGAppsHook4,
   desktop-file-utils,
-  libadwaita,
+  fetchFromGitLab,
   isocodes,
   json-glib,
+  libadwaita,
   libipuz,
+  meson,
+  ninja,
+  nix-update-script,
+  pkg-config,
+  shared-mime-info,
+  wrapGAppsHook4,
 }:
 
 stdenv.mkDerivation rec {
   pname = "crosswords";
-  version = "0.3.12";
+  version = "0.3.15";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "jrb";
     repo = "crosswords";
     rev = version;
-    hash = "sha256-3RL2LJdIHmDAjXaxqsE0n5UQMsuBJWEMoyAEoSBemR0=";
+    hash = "sha256-KcHcTjPoQNA5TBXnKgudjBTV/0JbeVMJ09XVAL7SizI=";
   };
 
   nativeBuildInputs = [
+    desktop-file-utils
     meson
     ninja
     pkg-config
+    shared-mime-info
     wrapGAppsHook4
-    desktop-file-utils
   ];
 
   buildInputs = [
-    libadwaita
     isocodes
     json-glib
+    libadwaita
     libipuz
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Crossword player and editor for GNOME";
     homepage = "https://gitlab.gnome.org/jrb/crosswords";
     changelog = "https://gitlab.gnome.org/jrb/crosswords/-/blob/${version}/NEWS.md?ref_type=tags";
     license = lib.licenses.gpl3Plus;
     mainProgram = "crosswords";
-    maintainers = with lib.maintainers; [ aleksana ];
+    maintainers = with lib.maintainers; [
+      aleksana
+      l0b0
+    ];
     platforms = lib.platforms.unix;
   };
 }

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

@@ -1,31 +1,50 @@
 {
   lib,
   stdenv,
+  cargo,
   fetchFromGitLab,
+  gi-docgen,
+  glib,
+  gobject-introspection,
+  json-glib,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
-  glib,
-  json-glib,
+  rustPlatform,
 }:
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libipuz";
-  version = "0.4.5";
+  version = "0.5.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "jrb";
     repo = "libipuz";
-    rev = version;
-    hash = "sha256-psC2cFqSTlToCtCxwosXyJbmX/96AEI0xqzXtlc/HQE=";
+    rev = finalAttrs.version;
+    hash = "sha256-8bFMtqRD90SF9uT39Wkjf0eUef+0HgyrqY+DFA/xutI=";
+  };
+
+  cargoRoot = "libipuz/rust";
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs)
+      pname
+      src
+      version
+      cargoRoot
+      ;
+    hash = "sha256-Aw/caE5Z5JxoKLEr2Dr2wq6cyFleNNwtKM1yXM8ZWmU=";
   };
 
   nativeBuildInputs = [
+    cargo
+    gi-docgen
+    glib
+    gobject-introspection
     meson
     ninja
     pkg-config
-    glib
+    rustPlatform.cargoSetupHook
   ];
 
   buildInputs = [
@@ -33,12 +52,20 @@ stdenv.mkDerivation rec {
     json-glib
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Library for parsing .ipuz puzzle files";
     homepage = "https://gitlab.gnome.org/jrb/libipuz";
-    changelog = "https://gitlab.gnome.org/jrb/libipuz/-/blob/${version}/NEWS.md?ref_type=tags";
-    license = lib.licenses.lgpl21Plus;
-    maintainers = with lib.maintainers; [ aleksana ];
+    changelog = "https://gitlab.gnome.org/jrb/libipuz/-/blob/${finalAttrs.version}/NEWS.md?ref_type=tags";
+    license = with lib.licenses; [
+      lgpl21Plus
+      mit
+    ];
+    maintainers = with lib.maintainers; [
+      aleksana
+      l0b0
+    ];
     platforms = lib.platforms.unix;
   };
-}
+})