Skip to content

gom: 0.3.3 → 0.4 #81616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
worldofpeace merged 3 commits into from
Mar 3, 2020
Merged

gom: 0.3.3 → 0.4 #81616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a52923
gom: 0.3.3 → 0.4
jtojnar Mar 3, 2020
54d984f
folks: Fix build
jtojnar Mar 3, 2020
4dc2771
folks: re-enable docs
jtojnar Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions pkgs/development/libraries/folks/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
, python3
, readline
, gtk3
, gtk-doc
, docbook-xsl-nons
, docbook_xml_dtd_43
}:

# TODO: enable more folks backends
Expand All @@ -31,22 +34,24 @@ stdenv.mkDerivation rec {
pname = "folks";
version = "0.13.2";

outputs = [ "out" "dev" ];
outputs = [ "out" "dev" "devdoc" ];

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0wq14yjs7m3axziy679a854vc7r7fj1l38p9jnyapb21vswdcqq2";
};

mesonFlags = [
# TODO: https://gitlab.gnome.org/GNOME/folks/issues/108
"-Ddocs=false"
"-Ddocs=true"
];

nativeBuildInputs = [
gettext
gobject-introspection
gtk3
gtk-doc
docbook-xsl-nons
docbook_xml_dtd_43
meson
ninja
pkgconfig
Expand Down Expand Up @@ -75,10 +80,16 @@ stdenv.mkDerivation rec {

checkInputs = [
dbus
(python3.withPackages (pp: with pp; [
python-dbusmock
# The following possibly need to be propagated by dbusmock
# if they are not optional
dbus-python
pygobject3
]))
];

# TODO: enable tests
# doCheck = true;
doCheck = true;

postPatch = ''
chmod +x meson_post_install.py
Expand Down
15 changes: 2 additions & 13 deletions pkgs/development/libraries/gom/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ stdenv
, fetchurl
, fetchpatch
, meson
, ninja
, pkgconfig
Expand All @@ -14,26 +13,16 @@

stdenv.mkDerivation rec {
pname = "gom";
version = "0.3.3";
version = "0.4";

outputs = [ "out" "py" ];

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1n1n226dyb3q98216aah87in9hhjcwsbpspsdqqfswz2bx5y6mxc";
sha256 = "aNCABqqjtYFpznzxg5SY9FaG+6gRXwms7Lidd+EBip0=";
};

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
];

Expand Down