Merge pull request #59298 from worldofpeace/gnome-pomodoro

gnome3.pomodoro: 0.13.4 -> 0.15.1

pkgs/desktops/gnome-3/misc/pomodoro/default.nix

@@ -1,49 +1,73 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook,
+{ stdenv
-  dbus-glib, libcanberra, gst_all_1, vala, gnome3, gtk3, libxml2, autoreconfHook,
+, fetchFromGitHub
-  glib, gobject-introspection, libpeas
+, autoconf-archive
+, appstream-glib
+, pkgconfig
+, wrapGAppsHook
+, libcanberra
+, gst_all_1
+, vala
+, gtk3
+, gom
+, sqlite
+, libxml2
+, autoreconfHook
+, glib
+, gobject-introspection
+, libpeas
+, gnome-shell
+, gsettings-desktop-schemas
+, adwaita-icon-theme
+, gettext
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.13.4";
+  pname = "gnome-shell-pomodoro";
-  name = "gnome-shell-pomodoro-${version}";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "codito";
     repo = "gnome-pomodoro";
-    rev = "${version}";
+    rev = version;
-    sha256 = "0fiql99nhj168wbfhvzrhfcm4c4569gikd2zaf10vzszdqjahrl1";
+    sha256 = "0nmgd122gsfka0p50mila88iwrzckq2r36a3h20lswn5qkn321i1";
   };
 
-  patches = [
-    # build with Vala ≥ 0.42
-    (fetchpatch {
-      url = https://github.com/codito/gnome-pomodoro/commit/36778823ca5bd94b2aa948e5d8718f84d99d9af0.patch;
-      sha256 = "0a9x0p5wny3an9xawam9nhpffw5m4kgwj5jvv0g6c2lwlfzrx2rh";
-    })
-  ];
-
   nativeBuildInputs = [
-    autoreconfHook vala autoconf-archive libtool intltool appstream-glib
+    appstream-glib
-    wrapGAppsHook pkgconfig libxml2
+    autoconf-archive
+    autoreconfHook
+    gettext
+    gobject-introspection
+    libxml2
+    pkgconfig
+    vala
+    wrapGAppsHook
   ];
 
   buildInputs = [
-    glib gobject-introspection libpeas
+    adwaita-icon-theme
-    dbus-glib libcanberra gst_all_1.gstreamer
+    glib
-    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+    gnome-shell
-    gnome3.gsettings-desktop-schemas
+    gom
-    gnome3.gnome-shell gtk3 gnome3.adwaita-icon-theme
+    gsettings-desktop-schemas
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gstreamer
+    gtk3
+    libcanberra
+    libpeas
+    sqlite
   ];
 
   meta = with stdenv.lib; {
-    homepage = http://gnomepomodoro.org/;
+    homepage = https://gnomepomodoro.org/;
-    description = "A time management utility for GNOME based on the pomodoro technique";
+    description = "Time management utility for GNOME based on the pomodoro technique";
     longDescription = ''
       This GNOME utility helps to manage time according to Pomodoro Technique.
       It intends to improve productivity and focus by taking short breaks.
     '';
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ worldofpeace ];
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };
 }

pkgs/development/libraries/gom/default.nix

@@ -0,0 +1,73 @@
+{ stdenv
+, fetchurl
+, fetchpatch
+, meson
+, ninja
+, pkgconfig
+, glib
+, python3
+, sqlite
+, gdk_pixbuf
+, gnome3
+, gobject-introspection
+}:
+
+stdenv.mkDerivation rec {
+  pname = "gom";
+  version = "0.3.3";
+
+  outputs = [ "out" "py" ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "1n1n226dyb3q98216aah87in9hhjcwsbpspsdqqfswz2bx5y6mxc";
+  };
+
+  patches = [
+    # Needed to apply the next patch
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gom/commit/e8b7c314ce61d459132cf03c9e455d2a01fdc6ea.patch";
+      sha256 = "0d7g3nm5lrfhfx9ly8qgf5bfp12kvr7m1xmlgin2q8vqpn0r2ggp";
+    })
+    # https://gitlab.gnome.org/GNOME/gom/merge_requests/3
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/worldofpeace/gom/commit/b621c15600b1c32826c9878565eb2398a50907f2.patch";
+      sha256 = "1hqck9bb7sxn4akisnn26sbddlphjsavgksick5k4h3rsc0xwx1v";
+    })
+    ./longer-stress-timeout.patch
+  ];
+
+  nativeBuildInputs = [
+    gobject-introspection
+    meson
+    ninja
+    pkgconfig
+  ];
+
+  buildInputs = [
+    gdk_pixbuf
+    glib
+    sqlite
+    python3.pkgs.pygobject3
+  ];
+
+  mesonFlags = [
+    "-Dpygobject-override-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
+  ];
+
+  doCheck = true;
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "A GObject to SQLite object mapper";
+    homepage = https://wiki.gnome.org/Projects/Gom;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = gnome3.maintainers;
+  };
+}

pkgs/development/libraries/gom/longer-stress-timeout.patch

@@ -0,0 +1,13 @@
+diff --git a/tests/meson.build b/tests/meson.build
+index 1df4884..d7a6f5d 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -25,7 +25,7 @@ test('test-gom-find', test_find)
+ 
+ test_stress = executable('test-gom-stress', 'test-gom-stress.c',
+   dependencies: [libgom_dep])
+-test('test-gom-stress', test_stress, timeout: 300)
++test('test-gom-stress', test_stress, timeout: 500)
+ 
+ test_transform = executable('test-gom-transform', 'test-gom-transform.c',
+   c_args: '-DIMAGE="@0@/gnome.png"'.format(meson.current_source_dir()),

pkgs/top-level/all-packages.nix

@@ -10459,6 +10459,8 @@ in
 
   glib-networking = callPackage ../development/libraries/glib-networking {};
 
+  gom = callPackage ../development/libraries/gom { };
+
   ace = callPackage ../development/libraries/ace { };
 
   atk = callPackage ../development/libraries/atk { };