From 5141b1c455fe740ea7a19b954092474b5956ebfe Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 11 Apr 2019 03:15:43 -0400 Subject: [PATCH 1/3] gom: init at 0.3.3 --- pkgs/development/libraries/gom/default.nix | 72 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/development/libraries/gom/default.nix diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix new file mode 100644 index 000000000000..584251ea86b8 --- /dev/null +++ b/pkgs/development/libraries/gom/default.nix @@ -0,0 +1,72 @@ +{ 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"; + }) + ]; + + 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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e743d1d0b6b8..cdf3b49720d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10398,6 +10398,8 @@ in glib-networking = callPackage ../development/libraries/glib-networking {}; + gom = callPackage ../development/libraries/gom { }; + ace = callPackage ../development/libraries/ace { }; atk = callPackage ../development/libraries/atk { }; From 4a3debad14cb15b5c5bb7a2afd5ede37e18589d0 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 11 Apr 2019 03:24:11 -0400 Subject: [PATCH 2/3] gnome3.pomodoro: 0.13.4 -> 0.15.1 --- .../gnome-3/misc/pomodoro/default.nix | 76 ++++++++++++------- 1 file changed, 50 insertions(+), 26 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index 9829d5813e9f..fcbceab24eab 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -1,49 +1,73 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook, - dbus-glib, libcanberra, gst_all_1, vala, gnome3, gtk3, libxml2, autoreconfHook, - glib, gobject-introspection, libpeas +{ stdenv +, fetchFromGitHub +, 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"; - name = "gnome-shell-pomodoro-${version}"; + pname = "gnome-shell-pomodoro"; + version = "0.15.1"; src = fetchFromGitHub { owner = "codito"; repo = "gnome-pomodoro"; - rev = "${version}"; - sha256 = "0fiql99nhj168wbfhvzrhfcm4c4569gikd2zaf10vzszdqjahrl1"; + rev = version; + 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 - wrapGAppsHook pkgconfig libxml2 + appstream-glib + autoconf-archive + autoreconfHook + gettext + gobject-introspection + libxml2 + pkgconfig + vala + wrapGAppsHook ]; buildInputs = [ - glib gobject-introspection libpeas - dbus-glib libcanberra gst_all_1.gstreamer - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gnome3.gsettings-desktop-schemas - gnome3.gnome-shell gtk3 gnome3.adwaita-icon-theme + adwaita-icon-theme + glib + gnome-shell + gom + 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/; - description = "A time management utility for GNOME based on the pomodoro technique"; + homepage = https://gnomepomodoro.org/; + 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; [ ]; - license = licenses.gpl3; + maintainers = with maintainers; [ worldofpeace ]; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } From c2d8d2fece7b53a20d4955cb3975a012175b916b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 11 Apr 2019 18:09:26 -0400 Subject: [PATCH 3/3] gom: patch longer timout for stress test https://gitlab.gnome.org/GNOME/gom/issues/22 --- pkgs/development/libraries/gom/default.nix | 1 + .../libraries/gom/longer-stress-timeout.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/gom/longer-stress-timeout.patch diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index 584251ea86b8..5694c50e90a3 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/worldofpeace/gom/commit/b621c15600b1c32826c9878565eb2398a50907f2.patch"; sha256 = "1hqck9bb7sxn4akisnn26sbddlphjsavgksick5k4h3rsc0xwx1v"; }) + ./longer-stress-timeout.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gom/longer-stress-timeout.patch b/pkgs/development/libraries/gom/longer-stress-timeout.patch new file mode 100644 index 000000000000..3dcd1d0a107f --- /dev/null +++ b/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()),