public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #81616 from jtojnar/gom-update

Browse Source 
gom: 0.3.3 → 0.4
This commit is contained in:
worldofpeace 2020-03-03 20:56:38 +00:00 committed by GitHub
commit c5590dd9d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/folks/default.nix
View File

@ -23,6 +23,9 @@
, python3 , python3
, readline , readline
, gtk3 , gtk3
, gtk-doc
, docbook-xsl-nons
, docbook_xml_dtd_43
}: }:
# TODO: enable more folks backends # TODO: enable more folks backends
@ -31,7 +34,7 @@ stdenv.mkDerivation rec {
pname = "folks"; pname = "folks";
version = "0.13.2"; version = "0.13.2";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
@ -39,14 +42,16 @@ stdenv.mkDerivation rec {
}; };
mesonFlags = [ mesonFlags = [
# TODO: https://gitlab.gnome.org/GNOME/folks/issues/108 "-Ddocs=true"
"-Ddocs=false"
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
gettext gettext
gobject-introspection gobject-introspection
gtk3 gtk3
gtk-doc
docbook-xsl-nons
docbook_xml_dtd_43
meson meson
ninja ninja
pkgconfig pkgconfig
@ -75,10 +80,16 @@ stdenv.mkDerivation rec {
checkInputs = [ checkInputs = [
dbus 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 = '' postPatch = ''
chmod +x meson_post_install.py chmod +x meson_post_install.py

15
pkgs/development/libraries/gom/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, fetchpatch
, meson , meson
, ninja , ninja
, pkgconfig , pkgconfig
@ -14,26 +13,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gom"; pname = "gom";
version = "0.3.3"; version = "0.4";
outputs = [ "out" "py" ]; outputs = [ "out" "py" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1n1n226dyb3q98216aah87in9hhjcwsbpspsdqqfswz2bx5y6mxc"; sha256 = "aNCABqqjtYFpznzxg5SY9FaG+6gRXwms7Lidd+EBip0=";
}; };
patches = [ 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 ./longer-stress-timeout.patch
]; ];