diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-03-03 20:56:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-03 20:56:38 +0000 |
| commit | c5590dd9d7e077a12b5827a929f778286031b3fc (patch) | |
| tree | d62676084398bfc3371ba0ad08b39cb7326dafe0 /pkgs/development/libraries | |
| parent | 74769b67998112f77eac423a4f96730ea0e02e2b (diff) | |
| parent | 4dc27717c3d68192f5912f1d40dfde2ba555afa6 (diff) | |
| download | nixlib-c5590dd9d7e077a12b5827a929f778286031b3fc.tar nixlib-c5590dd9d7e077a12b5827a929f778286031b3fc.tar.gz nixlib-c5590dd9d7e077a12b5827a929f778286031b3fc.tar.bz2 nixlib-c5590dd9d7e077a12b5827a929f778286031b3fc.tar.lz nixlib-c5590dd9d7e077a12b5827a929f778286031b3fc.tar.xz nixlib-c5590dd9d7e077a12b5827a929f778286031b3fc.tar.zst nixlib-c5590dd9d7e077a12b5827a929f778286031b3fc.zip | |
Merge pull request #81616 from jtojnar/gom-update
gom: 0.3.3 → 0.4
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/folks/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/development/libraries/gom/default.nix | 15 |
2 files changed, 18 insertions, 18 deletions
diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 6179ea983e33..89b7938de1e4 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -23,6 +23,9 @@ , python3 , readline , gtk3 +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 }: # TODO: enable more folks backends @@ -31,7 +34,7 @@ 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"; @@ -39,14 +42,16 @@ stdenv.mkDerivation rec { }; 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 @@ -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 diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index e006f8cd6f8e..2d5133afab4d 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , meson , ninja , pkgconfig @@ -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 ]; |